update gitattributes
This commit is contained in:
commit
9e55e5407c
|
@ -1,4 +1,5 @@
|
||||||
# Set the default behavior, in case people don't have core.autocrlf set.
|
# Set the default behavior, in case people don't have core.autocrlf set.
|
||||||
|
<<<<<<< HEAD
|
||||||
* text=auto
|
* text=auto
|
||||||
|
|
||||||
# Explicitly declare text files you want to always be normalized and converted
|
# Explicitly declare text files you want to always be normalized and converted
|
||||||
|
@ -12,3 +13,6 @@
|
||||||
# Denote all files that are truly binary and should not be modified.
|
# Denote all files that are truly binary and should not be modified.
|
||||||
*.png binary
|
*.png binary
|
||||||
*.jpg binary
|
*.jpg binary
|
||||||
|
=======
|
||||||
|
* text eol=crlf
|
||||||
|
>>>>>>> 543689e4ff503897e2e276ee4b29f8ee791c123a
|
||||||
|
|
Loading…
Reference in New Issue