.gitattributes.orig

text=auto

# Explicitly declare text files we want to always be normalized and converted

# to native line endings on checkout.

*.c text

*.h text

# Declare files that will always have CRLF line endings on checkout.

*.sln text eol=crlf

*.vcxproj text eol=crlf

<<<<<<< HEAD
=======
*.vcxproj.filters diff=astextplain eol=crlf

>>>>>>> dev
# Denote all files that are truly binary and should not be modified.

*.png binary
*.jpg binary