aboutsummaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore28
1 files changed, 2 insertions, 26 deletions
diff --git a/.gitignore b/.gitignore
index 25d43f8..2179336 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,3 @@
-# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
-
# dependencies
/node_modules
/.pnp
@@ -8,41 +6,19 @@
# testing
/coverage
-<<<<<<< HEAD
-=======
-# next.js
-/.next/
-/out/
+#IDE
+.idea
->>>>>>> ccf52d88eb60f518cc3e5bb3ce2b21bbb6858337
# production
/build
# misc
.DS_Store
-<<<<<<< HEAD
-=======
-*.pem
-
-# debug
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-
-# local files
->>>>>>> ccf52d88eb60f518cc3e5bb3ce2b21bbb6858337
.env.local
.env.development.local
.env.test.local
.env.production.local
-<<<<<<< HEAD
npm-debug.log*
yarn-debug.log*
yarn-error.log*
-=======
-/.idea
-
-# vercel
-.vercel
->>>>>>> ccf52d88eb60f518cc3e5bb3ce2b21bbb6858337