Merge pull request #35 from gnieark/dev

Dev
2015-12-25 20:27:10 +01:00 · 2015-12-25 20:27:10 +01:00 · 814937937c
commit 814937937c
parent 8c00535ebd 059f268d76
1 changed files with 0 additions and 6 deletions
--- 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,