From 55249e4e4dc5018807b14c05b3e3aee92cc069ad Mon Sep 17 00:00:00 2001
From: spencerwoo98 <spencerwoo98@foxmail.com>
Date: Tue, 16 Oct 2018 19:33:39 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=80=20Make=20changes=20to=20license=20?=
 =?UTF-8?q?notes.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README-zh.md | 4 ----
 README.md    | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/README-zh.md b/README-zh.md
index c0ddd7d..304dbdd 100644
--- a/README-zh.md
+++ b/README-zh.md
@@ -91,8 +91,4 @@ https://api.spencerwoo.com
 
 Created, authored and maintained by Spencer Woo.
 
-<<<<<<< HEAD
 [@Blog](https://spencerwoo.com/) · [ⒿJike](https://web.okjike.com/user/4DDA0425-FB41-4188-89E4-952CA15E3C5E/post) · [@GitHub](https://github.com/spencerwoo98)
-=======
-[© Spencer Woo](https://spencerwoo.com)
->>>>>>> 5a6590cd6846a08cb5a37e009813e70e00996efb
diff --git a/README.md b/README.md
index dbbb8e3..e4547bc 100644
--- a/README.md
+++ b/README.md
@@ -81,7 +81,6 @@ Contributions are welcome.
  
 <br>
 
-<<<<<<< HEAD
 ---
 
 **🚀 Simple Desktops API** ©Spencer Woo. Released under the MIT License. 
@@ -89,6 +88,3 @@ Contributions are welcome.
 Created, authored and maintained by Spencer Woo.
 
 [@Blog](https://spencerwoo.com/) · [ⒿJike](https://web.okjike.com/user/4DDA0425-FB41-4188-89E4-952CA15E3C5E/post) · [@GitHub](https://github.com/spencerwoo98)
-=======
-© Spencer Woo
->>>>>>> 5a6590cd6846a08cb5a37e009813e70e00996efb