add: gitattributes to ignore dsdanielpark#7

annias · May 16, 2023 · 8870081 · 8870081
1 parent 9081dc0
commit 8870081
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,5 @@
-<<<<<<< HEAD
 .gitattributes
 
-=======
->>>>>>> 22bd392f86659577dedceecaca378424fa87bd24
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]