Merge pull request #41 from JC-Coder/dev

fix conflict in .gitignore file
JC-Coder · Oct 10, 2023 · adb3e9b · adb3e9b
2 parents 5efd960 + e074a0e
commit adb3e9b
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,9 +1,6 @@
 node_modules/
-<<<<<<< HEAD
-=======
 .idea/
-.DS_Store
->>>>>>> master
+.DS_Store/
 dist
 .env
 .idea