Permalink
Browse files
Update .gitattributes for .resx to merge=union
- Loading branch information...
Showing
with
3 additions
and
4 deletions.
-
+3
−4
.gitattributes
|
|
@@ -19,25 +19,24 @@ |
|
|
*.coffee text
|
|
|
*.config text
|
|
|
*.cs text diff=csharp
|
|
|
+*.csproj text merge=union
|
|
|
*.css text
|
|
|
*.cshtml text
|
|
|
*.htm text
|
|
|
*.html text
|
|
|
*.htm text
|
|
|
*.js text
|
|
|
*.msbuild text
|
|
|
-*.resx text
|
|
|
+*.resx text merge=union
|
|
|
*.ruleset text
|
|
|
*.Stylecop text
|
|
|
*.targets text
|
|
|
*.tt text
|
|
|
*.txt text
|
|
|
*.vb text
|
|
|
*.vbhtml text
|
|
|
+*.vbproj text merge=union
|
|
|
*.xml text
|
|
|
*.xunit text
|
|
|
|
|
|
-*.csproj text merge=union
|
|
|
-*.vbproj text merge=union
|
|
|
-
|
|
|
*.sln text eol=crlf merge=union
|
0 comments on commit
0ed4083