fix: conflicts

This commit is contained in:
Rucha Mahabal
2020-02-27 13:16:53 +05:30
parent e29d5c1d5b
commit 99321cd538
444 changed files with 15057 additions and 10826 deletions

View File

@@ -1,5 +1,24 @@
{
"name": "erpnext",
"description": "Open Source ERP System powered by the Frappe Framework",
"repository": {
"type": "git",
"url": "git+https://github.com/frappe/erpnext.git"
},
"homepage": "https://erpnext.com",
"author": "Frappe Technologies Pvt. Ltd.",
"license": "GPL-3.0",
"bugs": {
"url": "https://github.com/frappe/erpnext/issues"
},
"devDependencies": {
"snyk": "^1.290.1"
},
"dependencies": {
"cypress": "^3.1.4"
}
},
"scripts": {
"snyk-protect": "snyk protect",
"prepare": "yarn run snyk-protect"
},
"snyk": true
}