Update .gitignore

byu-cxi · Jul 29, 2024 · b59eb70 · b59eb70
1 parent 49d0b7a
commit b59eb70
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # Files generated by invoking Julia with --code-coverage
 *.jl.cov
 *.jl.*.cov
@@ -25,4 +24,3 @@ docs/site/
 Manifest.toml
 =======
 /Manifest.toml
->>>>>>> a475770 (Files generated by PkgTemplates)