Fix unhandled merge conflict in .gitattributes (#68)

grindsa · Nov 30, 2024 · 1d550e1 · 1d550e1
1 parent aeb10be
commit 1d550e1
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,7 +1,3 @@
 # Auto detect text files and perform LF normalization
 * text=auto
-<<<<<<< HEAD
 test/* linguist-vendored
-=======
-test/* linguist-vendored
->>>>>>> devel