Merge pull request #35 from gnieark/dev

Dev
This commit is contained in:
Gnieark 2015-12-25 20:27:10 +01:00
commit 814937937c

View File

@ -1,10 +1,4 @@
CREATE TABLE `arena_history` ( CREATE TABLE `arena_history` (
<<<<<<< HEAD
=======
CREATE TABLE IF NOT EXISTS `arena_history` (
>>>>>>> f4f3a1f5e4b489cb7ef2bf70fc80467382f82585
`game` varchar(8) NOT NULL, `game` varchar(8) NOT NULL,
`player1_id` int(11) NOT NULL, `player1_id` int(11) NOT NULL,
`player2_id` int(11) NOT NULL, `player2_id` int(11) NOT NULL,