jeffemmett
/
non-fungible-apps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix merge conflict in gitignore

This commit is contained in:
EmperorOrokuSaki 2022-12-15 21:28:09 +03:30
parent 9e2c1368ca
commit 7de7672c0a
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package.json
View File

@ -10,7 +10,11 @@
"format": "prettier --write \"./**/*.{js,ts,sol}\"", "format": "prettier --write \"./**/*.{js,ts,sol}\"",
"node:hardhat": "hardhat node --tags local", "node:hardhat": "hardhat node --tags local",
"deploy:local": "hardhat deploy --tags local", "deploy:local": "hardhat deploy --tags local",
<<<<<<< HEAD
"deploy:mumbai": "hardhat deploy --tags mumbai --network mumbai", "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" "compile": "hardhat compile"
}, },
"repository": { "repository": {