From bf545ecbbdbe3c12640e6749d81f191c7ca0107a Mon Sep 17 00:00:00 2001
From: EmperorOrokuSaki <artie.eth@gmail.com>
Date: Thu, 15 Dec 2022 21:31:13 +0330
Subject: [PATCH] package.json fix

---
 package.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/package.json b/package.json
index e2cffb9..dba181e 100644
--- a/package.json
+++ b/package.json
@@ -10,11 +10,7 @@
     "format": "prettier --write \"./**/*.{js,ts,sol}\"",
     "node:hardhat": "hardhat node --tags local",
     "deploy:local": "hardhat deploy --tags local",
-<<<<<<< HEAD
     "deploy:mumbai": "hardhat deploy --tags mumbai --network mumbai",
-=======
-    "deploy:mumbai": "hardhat deploy --tags mumbai",
->>>>>>> c74a270 (Update test commands & add forge-cache and out to .gitignore)
     "compile": "hardhat compile"
   },
   "repository": {