From 356f46237c3281b09d1fcc1df4e19cb12947063e Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Sun, 19 Jun 2016 02:15:49 +0200
Subject: [PATCH] fix install.sql after a bad merge

---
 install.sql | 1 -
 1 file changed, 1 deletion(-)

diff --git a/install.sql b/install.sql
index 720e4ed5..bf9b92bf 100644
--- a/install.sql
+++ b/install.sql
@@ -314,7 +314,6 @@ CREATE TABLE `pages` (
   UNIQUE KEY `u_pages` (`name`,`board`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
 
->>>>>>> 12fa8ec... Edit static pages commit
 /*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
 /*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;