Skip to content

Commit c04ceba

Browse files
committed
resolve merge conflict
2 parents 290a1da + 5c64f16 commit c04ceba

3 files changed

Lines changed: 3 additions & 8 deletions

File tree

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99
*.user
1010
*.userosscache
1111
*.sln.docstates
12+
*.wsuo
13+
14+
VSWorkspaceState.json
1215

1316
# User-specific files (MonoDevelop/Xamarin Studio)
1417
*.userprefs

.vs/VSWorkspaceState.json

Lines changed: 0 additions & 8 deletions
This file was deleted.

.vs/world.net/v17/.wsuo

-11 KB
Binary file not shown.

0 commit comments

Comments
 (0)