fix(merge): fix merge error

privacy-scaling-explorations · Oct 11, 2023 · a3ead4b · a3ead4b
1 parent cc14efe
commit a3ead4b
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 8 deletions.
diff --git a/packages/backend/package.json b/packages/backend/package.json
@@ -1,10 +1,6 @@
 {
     "name": "@p0tion/backend",
-<<<<<<< HEAD
     "version": "1.0.8",
-=======
-    "version": "1.0.7",
->>>>>>> 110e869 ([release/v1.0.7] Promote dev to staging (#176))
     "description": "MPC Phase 2 backend for Firebase services management",
     "repository": "[email protected]:privacy-scaling-explorations/p0tion.git",
     "homepage": "https://github.com/privacy-scaling-explorations/p0tion",

diff --git a/packages/phase2cli/package.json b/packages/phase2cli/package.json
@@ -1,11 +1,7 @@
 {
     "name": "@p0tion/phase2cli",
     "type": "module",
-<<<<<<< HEAD
     "version": "1.0.8",
-=======
-    "version": "1.0.7",
->>>>>>> 110e869 ([release/v1.0.7] Promote dev to staging (#176))
     "description": "All-in-one interactive command-line for interfacing with zkSNARK Phase 2 Trusted Setup ceremonies",
     "repository": "[email protected]:privacy-scaling-explorations/p0tion.git",
     "homepage": "https://github.com/privacy-scaling-explorations/p0tion",