From 2f3dccc42297b4b026a5d27444d33999e0e77bef Mon Sep 17 00:00:00 2001
From: Romain Vigier <romain@romainvigier.fr>
Date: Thu, 13 Feb 2020 19:07:17 +0100
Subject: [PATCH] Fix Readme

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

diff --git a/README.md b/README.md
index 40e2b28..79f178f 100644
--- a/README.md
+++ b/README.md
@@ -15,11 +15,8 @@ These themes have been tested and work:
 - Adapta
 - Adwaita
 - Arc
-<<<<<<< HEAD
 - Canta
-=======
 - Flat-Remix-GTK
->>>>>>> theme-flat-remix-gtk
 - HighContrast
 - Layan
 - Matcha (thank you @Chrysostomus)