diff options
| author | Ognjen Cirkovic <ciraboxkg@gmail.com> | 2022-11-08 15:02:03 +0000 |
|---|---|---|
| committer | Ognjen Cirkovic <ciraboxkg@gmail.com> | 2022-11-08 15:02:03 +0000 |
| commit | 9659c8868d19b31cf9ecae40bd28a30f13127f26 (patch) | |
| tree | 428f090f1d20cc0b4a2865fdc2fdbf5f8af38fbc /.vs | |
| parent | f695db67989fd9c2c7b045bc55d8aa780b388d5d (diff) | |
| parent | 6181721dc548421ec2926c17a73f0d48a2c99482 (diff) | |
Merge branch 'develop' into 'master'
Merge develop -> master
See merge request BrzoDoLokacije2022/odyssey/brzodolokacije!3
Diffstat (limited to '.vs')
| -rw-r--r-- | .vs/ProjectSettings.json | 3 | ||||
| -rw-r--r-- | .vs/VSWorkspaceState.json | 6 | ||||
| -rw-r--r-- | .vs/brzodolokacije/v17/.suo | bin | 0 -> 16896 bytes | |||
| -rw-r--r-- | .vs/slnx.sqlite | bin | 0 -> 262144 bytes |
4 files changed, 9 insertions, 0 deletions
diff --git a/.vs/ProjectSettings.json b/.vs/ProjectSettings.json new file mode 100644 index 0000000..f8b4888 --- /dev/null +++ b/.vs/ProjectSettings.json @@ -0,0 +1,3 @@ +{ + "CurrentProjectSetting": null +}
\ No newline at end of file diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json new file mode 100644 index 0000000..6b61141 --- /dev/null +++ b/.vs/VSWorkspaceState.json @@ -0,0 +1,6 @@ +{ + "ExpandedNodes": [ + "" + ], + "PreviewInSolutionExplorer": false +}
\ No newline at end of file diff --git a/.vs/brzodolokacije/v17/.suo b/.vs/brzodolokacije/v17/.suo Binary files differnew file mode 100644 index 0000000..5ee74c0 --- /dev/null +++ b/.vs/brzodolokacije/v17/.suo diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite Binary files differnew file mode 100644 index 0000000..7c42e4b --- /dev/null +++ b/.vs/slnx.sqlite |