From 8569a6fa3fdc2aeb769e100a2417e7f6534f1ce8 Mon Sep 17 00:00:00 2001
From: Stefano Pigozzi <ste.pigozzi@gmail.com>
Date: Tue, 19 Apr 2016 12:23:59 -0400
Subject: [PATCH] ops

---
 mifia.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/mifia.py b/mifia.py
index b668c0a1..b277045e 100644
--- a/mifia.py
+++ b/mifia.py
@@ -349,14 +349,9 @@ while True:
                     p.message(g.mifiastatus())
             elif t['text'].startswith("/fullstatus"):
                 if t['from']['id'] == g.adminid:
-<<<<<<< HEAD
-                    g.adminmessage(g.fullstatus())
-                    g.adminmessage(g.displaycount())
-=======
                     g.adminmessage(g.fullstatus() + "\n" + g.displaycount())
                 else:
                     g.message("\u26A0\uFE0F Non sei il creatore della partita; non puoi vedere lo status completo.")
->>>>>>> 6a580d30baa57bd0c46db6953c19f07ee865ac5e
             elif t['text'].startswith("/save"):
                 if t['from']['id'] == g.adminid:
                     g.save()