Skip to content

Commit e3c4267

Browse files
authored
Remove merge=union for project files
1 parent 4558d53 commit e3c4267

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

.gitattributes

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
*.msbuild text
1313
*.md text
1414

15-
*.sln text eol=crlf merge=union
16-
*.csproj text merge=union
17-
*.vbproj text merge=union
18-
*.fsproj text merge=union
19-
*.dbproj text merge=union
15+
*.sln text eol=crlf
16+
*.csproj text eol=crlf
17+
*.vbproj text eol=crlf
18+
*.fsproj text eol=crlf
19+
*.dbproj text eol=crlf
2020

2121
# Resharper DotSettings files are in Unix format
2222
*.DotSettings text eol=lf

0 commit comments

Comments
 (0)