fix(bad merge): fix bad merge

privacy-scaling-explorations · Oct 11, 2023 · 2d0e42a · 2d0e42a
1 parent a3ead4b
commit 2d0e42a
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
@@ -67,11 +67,7 @@
         "@aws-sdk/client-ssm": "^3.357.0",
         "@aws-sdk/middleware-endpoint": "^3.329.0",
         "@aws-sdk/s3-request-presigner": "^3.329.0",
-<<<<<<< HEAD
         "@p0tion/actions": "^1.0.8",
-=======
-        "@p0tion/actions": "^1.0.7",
->>>>>>> 110e869 ([release/v1.0.7] Promote dev to staging (#176))
         "blakejs": "^1.2.1",
         "dotenv": "^16.0.3",
         "ethers": "5.7.2",

diff --git a/packages/phase2cli/package.json b/packages/phase2cli/package.json
@@ -68,11 +68,7 @@
         "@octokit/auth-oauth-app": "^5.0.5",
         "@octokit/auth-oauth-device": "^4.0.4",
         "@octokit/request": "^6.2.3",
-<<<<<<< HEAD
         "@p0tion/actions": "^1.0.8",
-=======
-        "@p0tion/actions": "^1.0.7",
->>>>>>> 110e869 ([release/v1.0.7] Promote dev to staging (#176))
         "blakejs": "^1.2.1",
         "boxen": "^7.1.0",
         "chalk": "^5.2.0",