From 42691d6b0668bb1fdcb1745c78fcd404cf74f78f Mon Sep 17 00:00:00 2001
From: ThinaticSystem <git@thinaticsystem.com>
Date: Sun, 5 Sep 2021 16:31:44 +0900
Subject: [PATCH] =?UTF-8?q?=E3=83=9E=E3=83=BC=E3=82=B8=E3=83=9F=E3=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/package.json b/package.json
index b8c7b14fb..363185dd3 100644
--- a/package.json
+++ b/package.json
@@ -1,13 +1,7 @@
 {
-<<<<<<< HEAD
 	"name": "honisskey",
 	"author": "ThinaticSystem <git@thinaticsystem.com>",
-	"version": "12.90.0",
-=======
-	"name": "misskey",
-	"author": "syuilo <syuilotan@yahoo.co.jp>",
 	"version": "12.90.1",
->>>>>>> upstream/master
 	"codename": "indigo",
 	"repository": {
 		"type": "git",