update gitattributes

2 years ago · 9e55e5407c
parent 278cd99cd9 543689e4ff
commit 9e55e5407c
1 changed files with 5 additions and 1 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -1,4 +1,5 @@
 # Set the default behavior, in case people don't have core.autocrlf set.
+<<<<<<< HEAD
 * text=auto

 # Explicitly declare text files you want to always be normalized and converted
@ -11,4 +12,7 @@

 # Denote all files that are truly binary and should not be modified.
 *.png binary
-*.jpg binary
+*.jpg binary
+=======
+* text eol=crlf
+>>>>>>> 543689e4ff503897e2e276ee4b29f8ee791c123a