remove merge comments from gitignore

lincc-frameworks · Apr 16, 2024 · 202f3a5 · 202f3a5
1 parent 353dedf
commit 202f3a5
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -140,9 +140,6 @@ dask-worker-space/
 tmp/
 
 # Mac OS
-<<<<<<< before updating
-.DS_Store
-=======
 .DS_Store
 
 # Airspeed Velocity performance results
@@ -151,4 +148,3 @@ _html/
 
 # Project initialization script
 .initialize_new_project.sh
->>>>>>> after updating