fix install.sql after a bad merge

8 years ago · 356f46237c
1 changed files with 0 additions and 1 deletions
--- 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 */;