Merge pull request #32 from CamTosh/patch-1

Delete merge fail
2015-12-25 19:41:47 +01:00 · 2015-12-25 19:41:47 +01:00 · f4f3a1f5e4
commit f4f3a1f5e4
parent da01e620fb 9a2412351d
1 changed files with 2 additions and 2 deletions
--- a/install.sql
+++ b/install.sql
@ -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,