Delete merge fail

This commit is contained in:
Tosh Camille 2015-12-25 19:21:55 +01:00
parent da01e620fb
commit 9a2412351d

View File

@ -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,