fix: merge conflict fix

lucent-intern-org · Aug 12, 2022 · 40d89e2 · 40d89e2
1 parent f28a9e3
commit 40d89e2
Show file tree

Hide file tree

Showing 14 changed files with 1,574 additions and 3,986 deletions.
diff --git a/frontend/web/.gitignore b/frontend/web/.gitignore
@@ -4,6 +4,7 @@
 /node_modules
 /.pnp
 .pnp.js
+package-lock.json
 
 # testing
 /coverage
@@ -17,6 +18,7 @@
 .env.development.local
 .env.test.local
 .env.production.local
+.env
 
 npm-debug.log*
 yarn-debug.log*