Skip to content

Commit

Permalink
KristianRosenvold: Put an end crlf issues once and for all with .gita…
Browse files Browse the repository at this point in the history
…ttibutes
  • Loading branch information
krosenvold committed Jan 15, 2013
1 parent bc1dba8 commit 55504b8
Showing 1 changed file with 15 additions and 0 deletions.
15 changes: 15 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Auto detect text files and perform LF normalization
* text=auto

*.cs text diff=csharp
*.java text diff=java
*.html text diff=html
*.css text
*.js text
*.sql text

*.csproj text merge=union
*.sln text merge=union eol=crlf

*.docx diff=astextplain
*.DOCX diff=astextplain

0 comments on commit 55504b8

Please sign in to comment.