From 810749560636bb7ead5e23f26ccd4337ec264694 Mon Sep 17 00:00:00 2001
From: Miriam Retka <miriamretka@gmail.com>
Date: Thu, 25 May 2023 13:09:54 -0300
Subject: [PATCH] Fix README conflict

---
 README.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/README.md b/README.md
index df894dc..8cd0c14 100644
--- 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)