From 9a2412351d7f6bad8b339193354fe570cafc6e52 Mon Sep 17 00:00:00 2001 From: Tosh Camille Date: Fri, 25 Dec 2015 19:21:55 +0100 Subject: [PATCH 1/2] 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, From 059f268d76056dd1e4df4cde17662bea1e8b9feb Mon Sep 17 00:00:00 2001 From: Gnieark Date: Fri, 25 Dec 2015 20:26:35 +0100 Subject: [PATCH 2/2] install.sql --- install.sql | 6 ------ 1 file changed, 6 deletions(-) diff --git a/install.sql b/install.sql index 21d199d..b1e125f 100644 --- a/install.sql +++ b/install.sql @@ -1,10 +1,4 @@ CREATE TABLE `arena_history` ( -<<<<<<< HEAD -======= - -CREATE TABLE IF NOT EXISTS `arena_history` ( - ->>>>>>> f4f3a1f5e4b489cb7ef2bf70fc80467382f82585 `game` varchar(8) NOT NULL, `player1_id` int(11) NOT NULL, `player2_id` int(11) NOT NULL,