From 9648455f544d1b8dd752bebdc074b4995aa17248 Mon Sep 17 00:00:00 2001 From: LautaroPetaccio Date: Wed, 27 Nov 2024 17:08:02 -0300 Subject: [PATCH] fix: Merge conflicts --- webapp/package-lock.json | 10 ---------- webapp/package.json | 6 +----- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/webapp/package-lock.json b/webapp/package-lock.json index 7a60de163..033905116 100644 --- a/webapp/package-lock.json +++ b/webapp/package-lock.json @@ -27,11 +27,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", @@ -9687,15 +9683,9 @@ } }, "node_modules/decentraland-dapps": { -<<<<<<< HEAD "version": "23.14.2", "resolved": "https://registry.npmjs.org/decentraland-dapps/-/decentraland-dapps-23.14.2.tgz", "integrity": "sha512-zEI6KlXbGj/ENWbJXt4GdasjH7OyQKCQWVUVJg2CBoVLyvlDjM+c1eJbSFr8vwYO1kxUVjWbqQEaTnowrwnV9g==", -======= - "version": "23.14.0", - "resolved": "https://registry.npmjs.org/decentraland-dapps/-/decentraland-dapps-23.14.0.tgz", - "integrity": "sha512-uKx66Hb9Wwq4UdnHBnPHC3WLUawi2TB8uelFL9OinqDbYRRmX7mIPRPAiaf9W3/uwMOwLwH2YlMrACtwUAVaww==", ->>>>>>> 37a5a43a6155e0886a236e82aee51b75784d5429 "dependencies": { "@0xsequence/multicall": "^0.25.1", "@0xsequence/relayer": "^0.25.1", diff --git a/webapp/package.json b/webapp/package.json index 085a650e8..a141e0c0e 100644 --- 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" } -} \ No newline at end of file +}