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 1717#
1818# Merging from the command prompt will add diff markers to the files if there
1919# 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
2121# file extensions to fail to load in VS. An alternative would be to treat
2222# these files as binary and thus will always conflict and require user
2323# intervention with every merge. To do so, just uncomment the entries below
2424# ##############################################################################
25- # *.sln merge=binary
25+ # *.slnx merge=binary
2626# *.csproj merge=binary
2727# *.vbproj merge=binary
2828# *.vcxproj merge=binary
4646
4747# ##############################################################################
4848# diff behavior for common document formats
49- #
49+ #
5050# 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
5252# entries below.
5353# ##############################################################################
5454# *.doc diff=astextplain
Original file line number Diff line number Diff line change 44# User-specific files
55* .suo
66* .user
7- * .sln .docstates
7+ * .slnx .docstates
88
99.vs
1010* .lock.json
@@ -127,7 +127,7 @@ publish/
127127# Publish Web Output
128128* . [Pp ]ublish.xml
129129* .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
131131# but database connection strings (with potential passwords) will be unencrypted
132132* .pubxml
133133* .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