Merge branch 'master' of github.com:famibee/SKYNovel_hatsune

famibee · Jun 9, 2020 · da353bf · da353bf
2 parents c615167 + db26db8
commit da353bf
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -8,7 +8,11 @@
 	"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"