diff options
| author | czaks <marcin@6irc.net> | 2016-06-19 02:15:49 +0200 |
|---|---|---|
| committer | czaks <marcin@6irc.net> | 2016-06-19 02:15:49 +0200 |
| commit | 356f46237c3281b09d1fcc1df4e19cb12947063e (patch) | |
| tree | be0c65e415d0bbf58cb1dd92883a546646e610c4 | |
| parent | e230f1472cdd9fe5d416196d51e905eac22ce70e (diff) | |
fix install.sql after a bad merge
| -rw-r--r-- | install.sql | 1 |
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 */; |