grr

2015-12-04 22:45:36 +01:00 · 2015-12-04 22:45:36 +01:00 · 52a52dd19e
commit 52a52dd19e
parent fc98087538 78ad5ac2a3
1 changed files with 3 additions and 1 deletions
--- a/install.sql
+++ b/install.sql
@ -1,5 +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,