resolved conflicts

This commit is contained in:
Ritesh Kumar committed 2017-09-15 01:28:35 +05:30
commit 3b3d53d19f
10 files changed
+101 -19

No files matched your search

-4
View File
@@ -46,7 +46,6 @@
"is-svg": "^2.1.0",
"json-schema-to-typescript": "^4.6.0",
"lodash": "^4.17.4",
"min-document": "^2.19.0",
"next": "^3.2.1",
"nprogress": "^0.2.0",
"promise-worker": "^1.1.1",
@@ -62,7 +61,6 @@
"transform-graphql-type-annotations": "^0.1.1",
"transform-json-types": "^0.2.6",
"transform-svg-to-native": "^0.1.3",
"undom": "^0.3.3",
"unfetch": "^3.0.0",
"xml-js": "^1.4.1"
},
@@ -70,11 +68,9 @@
"all-contributors-cli": "^4.4.0",
"babili-webpack-plugin": "^0.1.2",
"css-loader": "^0.28.7",
"deep-diff": "^0.3.8",
"glob": "^7.1.2",
"husky": "^0.14.3",
"lint-staged": "^4.1.3",
"prettier": "^1.6.1",
"prettier-standard": "^6.0.0",
"style-loader": "^0.18.2",
"sw-precache-webpack-plugin": "^0.11.4",