Skip to content
Sign up
This repository

public / aspnetwebstack Octocat-spinner-32

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Update .gitattributes for .resx to merge=union

  • Loading branch information...
commit 0ed40839cbbc4013dc877e075ca81f4500458696 1 parent 111ce90
Brad Wilson authored

Showing 1 changed file with 3 additions and 4 deletions. Show Diff Stats Hide Diff Stats

  1. 7  .gitattributes
7  .gitattributes
View 
@@ -19,6 +19,7 @@
19 19 
 *.coffee text
20 20 
 *.config text
21 21 
 *.cs text diff=csharp
  22 
+*.csproj text merge=union
22 23 
 *.css text
23 24 
 *.cshtml text
24 25 
 *.htm text
 
@@ -26,7 +27,7 @@
26 27 
 *.htm text
27 28 
 *.js text
28 29 
 *.msbuild text
29   
-*.resx text
  30 
+*.resx text merge=union
30 31 
 *.ruleset text
31 32 
 *.Stylecop text
32 33 
 *.targets text
 
@@ -34,10 +35,8 @@
34 35 
 *.txt text
35 36 
 *.vb text
36 37 
 *.vbhtml text
  38 
+*.vbproj text merge=union
37 39 
 *.xml text
38 40 
 *.xunit text
39 41
40   
-*.csproj text merge=union
41   
-*.vbproj text merge=union
42   
-
43 42 
 *.sln text eol=crlf merge=union

0 notes on commit 0ed4083

Please sign in to comment.
Something went wrong with that request. Please try again.