Merge branch 'master' of github.com:gnieark/botsArena

Conflicts: install.sql
2015-12-25 20:21:30 +01:00 · 2015-12-25 20:21:30 +01:00 · 8c00535ebd
commit 8c00535ebd
parent 0a4b65082c f4f3a1f5e4
1 changed files with 6 additions and 0 deletions
--- a/install.sql
+++ b/install.sql
@ -1,4 +1,10 @@
 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,