Fix README conflict

Auralcat · May 25, 2023 · 8107495 · 8107495
1 parent 971df35
commit 8107495
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -1,8 +1,5 @@
 # fairyfloss theme
 
 ![theme logo](http://sailorhg.github.io/fairyfloss/fairyfloss.png)
-<<<<<<< HEAD
-=======
 
->>>>>>> e02c4f3f70754f0233e5aab5ac9278bacb3c4ddf
 ![theme screenshot](http://sailorhg.github.io/fairyfloss/code.png)