diff options
| author | Alex-TIMEHACK <[email protected]> | 2017-05-01 10:15:05 +0100 |
|---|---|---|
| committer | Alex-TIMEHACK <[email protected]> | 2017-05-01 10:15:05 +0100 |
| commit | a8bf32646b66951eef7f2e8477d83d4d3f013a87 (patch) | |
| tree | 2659eea01895a4077c743aed399aff5631ba9b46 /.vs | |
| parent | e557e46076e0fe44fb03633665ae40c7d7444461 (diff) | |
| parent | 93c445239c7d28a6cee7147d7b6dbe3c7f0974f9 (diff) | |
| download | histacom2-a8bf32646b66951eef7f2e8477d83d4d3f013a87.tar.gz histacom2-a8bf32646b66951eef7f2e8477d83d4d3f013a87.tar.bz2 histacom2-a8bf32646b66951eef7f2e8477d83d4d3f013a87.zip | |
Trying to fix the conflicts
Diffstat (limited to '.vs')
| -rw-r--r-- | .vs/TimeHACK/v15/.suo | bin | 163328 -> 162816 bytes | |||
| -rw-r--r-- | .vs/VSWorkspaceState.json | 8 | ||||
| -rw-r--r-- | .vs/slnx.sqlite | bin | 0 -> 929792 bytes |
3 files changed, 8 insertions, 0 deletions
diff --git a/.vs/TimeHACK/v15/.suo b/.vs/TimeHACK/v15/.suo Binary files differindex 801d8c8..196d511 100644 --- a/.vs/TimeHACK/v15/.suo +++ b/.vs/TimeHACK/v15/.suo diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json new file mode 100644 index 0000000..6ccf169 --- /dev/null +++ b/.vs/VSWorkspaceState.json @@ -0,0 +1,8 @@ +{ + "ExpandedNodes": [ + "", + "\\TimeHACK.Engine" + ], + "SelectedNode": "\\TimeHACK.Engine\\MessageParser.cs", + "PreviewInSolutionExplorer": false +}
\ No newline at end of file diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite Binary files differnew file mode 100644 index 0000000..62ecf7b --- /dev/null +++ b/.vs/slnx.sqlite |