🚀 Make changes to license notes.

spencerwooo · Oct 16, 2018 · 55249e4 · 55249e4
1 parent a566969
commit 55249e4
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 8 deletions.
diff --git 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
@@ -81,14 +81,10 @@ Contributions are welcome.
 
 <br>
 
-<<<<<<< HEAD
 ---
 
 **🚀 Simple Desktops API** ©Spencer Woo. Released under the MIT License. 
 
 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