summaryrefslogtreecommitdiff
path: root/install.sql
diff options
context:
space:
mode:
Diffstat (limited to 'install.sql')
-rw-r--r--install.sql1
1 files changed, 0 insertions, 1 deletions
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 */;