v2.0.0：追加更新

famibee · Jun 9, 2020 · 6857c19 · 6857c19
1 parent da353bf
commit 6857c19
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -8,11 +8,7 @@
 	"author": "ugainovel",
 	"license": "MIT",
 	"dependencies": {
-<<<<<<< HEAD
 		"@famibee/skynovel": "^1.0.0",
-=======
-		"@famibee/skynovel": "^0.22.0",
->>>>>>> db26db827927c8e7b999e69a922ff1a06edbc0d5
 		"about-window": "^1.13.4",
 		"crypto-js": "^4.0.0",
 		"humane-js": "^3.2.2"