squash!

PlayForm · Feb 16, 2024 · 297ad71 · 297ad71
2 parents a6fc603 + 32f9291
commit 297ad71
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/package.json b/package.json
@@ -41,7 +41,11 @@
 		"autoprefixer": "10.4.17",
 		"cssnano": "6.0.3",
 		"cssnano-preset-advanced": "6.0.3",
+<<<<<<< HEAD
 		"dotenv": "16.4.4",
+=======
+		"dotenv": "16.4.3",
+>>>>>>> 32f92919e2b83eada92b7e9d46dee4c5d8efddb5
 		"firebase": "10.8.0",
 		"postcss": "8.4.35",
 		"postcss-combine-duplicated-selectors": "10.0.3",