Git ignore

ChangePlusPlusVandy · Feb 13, 2024 · d9fa1f0 · d9fa1f0
1 parent 34bff8f
commit d9fa1f0
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,4 @@
 node_modules/
-<<<<<<< HEAD
-.env
-=======
 .env
 build/
 .nyc_output/
->>>>>>> main
diff --git a/.nyc_output/processinfo/index.json b/.nyc_output/processinfo/index.json