fix: Merge conflicts

decentraland · Nov 27, 2024 · 9648455 · 9648455
1 parent 2efe6b0
commit 9648455
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 15 deletions.
diff --git a/webapp/package-lock.json b/webapp/package-lock.json
diff --git a/webapp/package.json b/webapp/package.json
@@ -22,11 +22,7 @@
     "dcl-catalyst-commons": "^9.0.1",
     "decentraland-connect": "^7.3.2",
     "decentraland-crypto-fetch": "^1.0.3",
-<<<<<<< HEAD
     "decentraland-dapps": "^23.14.2",
-=======
-    "decentraland-dapps": "^23.14.0",
->>>>>>> 37a5a43a6155e0886a236e82aee51b75784d5429
     "decentraland-transactions": "^2.17.0",
     "decentraland-ui": "^6.12.1",
     "ethers": "^5.6.8",
@@ -127,4 +123,4 @@
     "type": "git",
     "url": "https://github.com/decentraland/marketplace.git"
   }
-}
+}