Removed content from merge conflict

This commit is contained in:
Kristian Sloth Lauszus 2015-02-22 20:37:42 +01:00
parent d25f28109d
commit 82f7088578

4
.gitattributes vendored
View file

@ -1,4 +1,3 @@
<<<<<<< HEAD
# Auto detect text files and perform LF normalization
* text=auto
* text eol=lf
@ -22,6 +21,3 @@
*.PDF diff=astextplain
*.rtf diff=astextplain
*.RTF diff=astextplain
=======
text eol=lf
>>>>>>> acca3c8fe06a3d95806a8656c8a6ddef081cc210