chore: resolve conflict

This commit is contained in:
a632079
2020-09-05 01:21:12 +08:00
3 changed files with 1377 additions and 1258 deletions
+997 -889
View File
File diff suppressed because it is too large Load Diff
+1 -1
View File
@@ -51,7 +51,7 @@
"eslint-plugin-prettier": "^3.1.4",
"husky": "4.2.5",
"intelli-espower-loader": "1.0.1",
"lint-staged": "10.2.11",
"lint-staged": "10.3.0",
"mocha": "8.1.3",
"power-assert": "1.6.1",
"prettier": "^2.1.1",
+379 -368
View File
File diff suppressed because it is too large Load Diff