fix conflict

alexguja · Sep 28, 2022 · d255f6c · d255f6c
1 parent 3369925
commit d255f6c
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -34,10 +34,7 @@
     "concurrently": "^7.3.0",
     "eslint": "^8.23.0",
     "firebase": "^9.9.2",
-<<<<<<< HEAD
     "firebase-tools": "^11.11.0",
-=======
->>>>>>> 385d672babe03d4581bef8202f054369dcc143d3
     "flamethrower-router": "^0.0.0-meme.12",
     "js-confetti": "^0.10.2",
     "postcss": "^8.4.16",