File tree Expand file tree Collapse file tree 4 files changed +15
-44
lines changed Expand file tree Collapse file tree 4 files changed +15
-44
lines changed Original file line number Diff line number Diff line change 17
17
#
18
18
# Merging from the command prompt will add diff markers to the files if there
19
19
# are conflicts (Merging from VS is not affected by the settings below, in VS
20
- # the diff markers are never inserted). Diff markers may cause the following
20
+ # the diff markers are never inserted). Diff markers may cause the following
21
21
# file extensions to fail to load in VS. An alternative would be to treat
22
22
# these files as binary and thus will always conflict and require user
23
23
# intervention with every merge. To do so, just uncomment the entries below
24
24
# ##############################################################################
25
- # *.sln merge=binary
25
+ # *.slnx merge=binary
26
26
# *.csproj merge=binary
27
27
# *.vbproj merge=binary
28
28
# *.vcxproj merge=binary
46
46
47
47
# ##############################################################################
48
48
# diff behavior for common document formats
49
- #
49
+ #
50
50
# Convert binary document formats to text before diffing them. This feature
51
- # is only available from the command line. Turn it on by uncommenting the
51
+ # is only available from the command line. Turn it on by uncommenting the
52
52
# entries below.
53
53
# ##############################################################################
54
54
# *.doc diff=astextplain
Original file line number Diff line number Diff line change 4
4
# User-specific files
5
5
* .suo
6
6
* .user
7
- * .sln .docstates
7
+ * .slnx .docstates
8
8
9
9
.vs
10
10
* .lock.json
@@ -127,7 +127,7 @@ publish/
127
127
# Publish Web Output
128
128
* . [Pp ]ublish.xml
129
129
* .azurePubxml
130
- # TODO: Comment the next line if you want to checkin your web deploy settings
130
+ # TODO: Comment the next line if you want to checkin your web deploy settings
131
131
# but database connection strings (with potential passwords) will be unencrypted
132
132
* .pubxml
133
133
* .publishproj
Load Diff This file was deleted.
Original file line number Diff line number Diff line change
1
+ <Solution >
2
+ <Folder Name =" /Solution Items/" >
3
+ <File Path =" .github/workflows/build.yml" />
4
+ <File Path =" build/common.props" />
5
+ <File Path =" README.md" />
6
+ </Folder >
7
+ <Project Path =" src/Exceptionless.RandomData/Exceptionless.RandomData.csproj" />
8
+ <Project Path =" test/Exceptionless.RandomData.Tests/Exceptionless.RandomData.Tests.csproj" />
9
+ </Solution >
You can’t perform that action at this time.
0 commit comments