Remove a stray conflict marker

2023-08-29 23:10:47 -04:00 · 2023-08-29 23:10:47 -04:00 · 5b4fd6fe66
parent b9425af234
commit 5b4fd6fe66
1 changed files with 0 additions and 1 deletions
--- a/kifu/gtk/config
+++ b/kifu/gtk/config
@ -1,4 +1,3 @@
-<<<<<<< HEAD
 {
    "Me":{
        "name":"Savanni",