idk what happened i hate git

2 years ago · a9d58ba57e
parent 5d689238c9
commit a9d58ba57e
1 changed files with 4 additions and 0 deletions
--- a/README.md
+++ b/README.md
@ -1,6 +1,10 @@
 <p align="center">
  <a href="https://github.com/crystal-linux/todo/">
+<<<<<<< Updated upstream
    <img src="hhttps://getcryst.al/site/assets/other/logo.png" alt="Logo" width="150" height="150">
+=======
+    <img src="https://getcryst.al/site/assets/other/icon-todo.png" alt="Logo" width="150" height="150">
+>>>>>>> Stashed changes
  </a>
 </p>