From 9a2412351d7f6bad8b339193354fe570cafc6e52 Mon Sep 17 00:00:00 2001
From: Tosh Camille <tochecamille@gmail.com>
Date: Fri, 25 Dec 2015 19:21:55 +0100
Subject: [PATCH] Delete merge fail

---
 install.sql | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/install.sql b/install.sql
index cba2d79..2ab8879 100644
--- a/install.sql
+++ b/install.sql
@@ -1,7 +1,7 @@
 CREATE TABLE `arena_history` (
-=======
+
 CREATE TABLE IF NOT EXISTS `arena_history` (
->>>>>>> origin/master
+
   `game` varchar(8) NOT NULL,
   `player1_id` int(11) NOT NULL,
   `player2_id` int(11) NOT NULL,