updated jar(s)

[pizzaservice-core.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index 712ebf5f37d6d1b5694d947750d69acdd86450b4..17cdcd5373ad22f616149f35b61236dfe81ebec3 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,7 +1,2 @@
-<<<<<<< HEAD
 # Use Linux/Uni* line-feed for new lines (prevents converting)
 * text=lf
-=======
-# Auto detect text files and perform LF normalization
-* text=auto
->>>>>>> 0d1f24c85b058414f76bf28c75ce73dc754cbe5c