From 6857c19fcf1173557815c295c18e491a200a6add Mon Sep 17 00:00:00 2001
From: famibee <famibee@gmail.com>
Date: Tue, 9 Jun 2020 20:35:07 +0900
Subject: [PATCH] =?UTF-8?q?v2.0.0=EF=BC=9A=E8=BF=BD=E5=8A=A0=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/package.json b/package.json
index 4b3e0bc..2eef023 100755
--- 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"