From 5b4fd6fe66346395664b637924f43ba050f7d095 Mon Sep 17 00:00:00 2001
From: Savanni D'Gerinel <savanni@luminescent-dreams.com>
Date: Tue, 29 Aug 2023 23:10:47 -0400
Subject: [PATCH] Remove a stray conflict marker

---
 kifu/gtk/config | 1 -
 1 file changed, 1 deletion(-)

diff --git a/kifu/gtk/config b/kifu/gtk/config
index 488307b..6b490e9 100644
--- a/kifu/gtk/config
+++ b/kifu/gtk/config
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 {
     "Me":{
         "name":"Savanni",