From b52fba6a6d4194a6df25dcde60e6a6df14594b13 Mon Sep 17 00:00:00 2001
From: Nikolaj Danger <nikolajgade@live.dk>
Date: Fri, 31 Jul 2020 16:48:57 +0200
Subject: [PATCH] :bug:

---
 funcs/games/fourInARow.py | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/funcs/games/fourInARow.py b/funcs/games/fourInARow.py
index 347a14e..b25b297 100644
--- a/funcs/games/fourInARow.py
+++ b/funcs/games/fourInARow.py
@@ -16,17 +16,10 @@ def fourInARowStart(channel, user, opponent):
             data["4 in a row games"][channel] = {"board": board,"winner":0,"win direction":"",
                 "win coordinates":[0,0],"players":[user,opponent],"turn":0}
 
-<<<<<<< HEAD
-        with open("resources/games/games.json", "w") as f:
-            json.dump(data,f,indent=4)
-        
-        4InARowDraw.drawImage(channel)
-=======
             with open("resources/games/games.json", "w") as f:
                 json.dump(data,f,indent=4)
             
-            draw4InARow.drawImage(channel)
->>>>>>> 17b326223562bda9247b2ce705ec6917c0576cbe
+            4InARowDraw.drawImage(channel)
 
             return "Started game. It's "+user+"'s turn", True, False, False
         else: