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.
-<<<<<<< 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