Update .gitignore

spacetelescope · Feb 26, 2024 · 3f383fc · 3f383fc
1 parent b5d885e
commit 3f383fc
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -148,11 +148,7 @@ src/stcal/_version.py
 
 # auto-generated API docs
 docs/source/api
-<<<<<<< HEAD
-.DS_Store
-=======
 .DS_Store
 
 # VSCode stuff
 .vscode
->>>>>>> 75e1efacba98506604174702b747e7586e9fbc95