From bd8453b351eb30f80504171b83fd5fe08eb3f442 Mon Sep 17 00:00:00 2001
From: oloturia <5429234+oloturia@users.noreply.github.com>
Date: Sat, 30 Oct 2021 17:29:46 +0200
Subject: [PATCH] fixed merge

---
 damastodon.py      | 8 --------
 draughts_engine.py | 4 ----
 2 files changed, 12 deletions(-)

diff --git a/damastodon.py b/damastodon.py
index 5367e0e..fb69ccd 100755
--- a/damastodon.py
+++ b/damastodon.py
@@ -65,11 +65,7 @@ def check_message(notification):
 					pickle.dump("@"+challenger,f)
 					pickle.dump(False,f)
 					pickle.dump(board,f)
-<<<<<<< HEAD
-				mastodon.status_post("◾: @"+account+" ◽: @"+challenger+" turn ◽\n"+dama.draw_checkerboard(board,space="🟥",white_norm="◽",white_knight="⚪",black_norm="◾",black_knight="⚫",empty="🟦",frstrow="0🇦 🇧 🇨 🇩 🇪 🇫 🇬 🇭\n"),visibility="direct")
-=======
 				mastodon.status_post("◾: @"+account+" ◽: @"+challenger+" turn ◽\n"+dama.draw_checkerboard(board,space="🟥 ",white_norm="◽ ",white_knight="⚪ ",black_norm="◾ ",black_knight="⚫ ",empty="🟦 ",frstrow=firow, column=colsx),visibility="direct")
->>>>>>> reversecheckboard
 				return
 			elif content.split(" ")[1].lower() == "no":
 				os.remove(save_position+content.split(" ")[0][1:])
@@ -107,11 +103,7 @@ def check_message(notification):
 						colour = "◾"
 					winner = dama.checkWin(board)
 					if winner == (False,False):
-<<<<<<< HEAD
-						mastodon.status_post("◾: "+black+" ◽: "+white+" turn "+colour+"\n"+dama.draw_checkerboard(board,space="🟥",white_norm="◽",white_knight="⚪",black_norm="◾",black_knight="⚫",empty="🟦",frstrow="0🇦 🇧 🇨 🇩 🇪 🇫 🇬 🇭 \n"),visibility="direct")
-=======
 						mastodon.status_post("◾: "+black+" ◽: "+white+" turn "+colour+"\n"+dama.draw_checkerboard(board,space="🟥 ",white_norm="◽ ",white_knight="⚪ ",black_norm="◾ ",black_knight="⚫ ",empty="🟦 ",frstrow=firow, column=colsx),visibility="direct")
->>>>>>> reversecheckboard
 						return
 					else:
 						if winner == (True,False):
diff --git a/draughts_engine.py b/draughts_engine.py
index 84017c7..991a442 100755
--- a/draughts_engine.py
+++ b/draughts_engine.py
@@ -2,14 +2,10 @@
 
 import re
 
-<<<<<<< HEAD
-def draw_checkerboard(status,space="▒",white_norm="h",white_knight="H",black_norm="b",black_knight="B",empty=" ",frstrow=" abcdefgh\n",column="12345678"):
-=======
 def draw_checkerboard(status,space="▒",white_norm="h",white_knight="H",black_norm="b",black_knight="B",empty=" ",column="12345678",frstrow=" abcdefgh\n"):
 	""" Draw a checkerboard, status is the virtual representation of the board, as a bi-dimensional array, white/black norm/knight are the representation of the pieces
 	space is a non-walkable cell, empty is a walkable cell, column contains labels for the left column, frstrow the labels for the first row.
 	"""
->>>>>>> reversecheckboard
 	bstr = ""
 	bstr += frstrow
 	for row in range(0,len(status)):