Merge pull request #36 from CURIOSSorg/feat/clean-gitignore

Removed some dead lines from .gitignore
CURIOSSorg · Aug 25, 2024 · 2c895cc · 2c895cc
2 parents a9bd769 + bed7ca3
commit 2c895cc
Showing 1 changed file with 2 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,15 +8,6 @@ node_modules
 builds
 package-lock.json
 public
-/resources/
-<<<<<<< HEAD
-.vs/
-CURIOSS/.vs
-=======
-<<<<<<< HEAD
+resources
 .vs
-=======
-.vs/
-CURIOSS/.vs
->>>>>>> 7eda92b (Delete .vs folder)
->>>>>>> ca34863 (Delete .vs folder)
+