Remove errant conflict marker from .gitignore

spacetelescope · May 10, 2023 · 77d0104 · 77d0104
1 parent 1a4826f
commit 77d0104
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -9,7 +9,6 @@ cmake_install.cmake
 install_manifest.txt
 compile_commands.json
 CTestTestfile.cmake
->>>>>>> 3f0833e9 (Ignore cmake)
 .lock-waf*
 .waf*
 bin.*