remove unwanted lines

quick-lint · Feb 26, 2024 · 33d2193 · 33d2193
1 parent c1fc9a4
commit 33d2193
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -10,10 +10,6 @@
 /docs/analytics/** -linguist-documentation
 /website/** linguist-documentation
 
-<<<<<<< Updated upstream
-# Auto detect text files and perform LF normalization
-* text=auto
-=======
 # Set the default behavior, in case people don't have core.autocrlf set.
 * text=auto
 
@@ -22,4 +18,3 @@
 *.cpp text
 *.h text
 *.pot
->>>>>>> Stashed changes