gnieark/botsArena
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Delete merge fail

Browse Source
This commit is contained in:
Tosh Camille 2015-12-25 19:21:55 +01:00
parent da01e620fb
commit 9a2412351d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
install.sql
View File

@ -1,7 +1,7 @@
CREATE TABLE `arena_history` ( CREATE TABLE `arena_history` (
=======
CREATE TABLE IF NOT EXISTS `arena_history` ( CREATE TABLE IF NOT EXISTS `arena_history` (
>>>>>>> origin/master
`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,