git config to handle line endings

.gitattributes

@@ -10,5 +10,16 @@
 /docs/analytics/** -linguist-documentation
 /website/** linguist-documentation
 
+<<<<<<< Updated upstream
 # Auto detect text files and perform LF normalization
-* text=auto
+* text=auto
+=======
+# Set the default behavior, in case people don't have core.autocrlf set.
+* text=auto
+
+# Explicitly declare text files you want to always be normalized and converted
+# to native line endings on checkout.
+*.cpp text
+*.h text
+*.pot
+>>>>>>> Stashed changes