g5 merge 충돌 수정

This commit is contained in:
chicpro committed 2014-05-29 10:25:46 +09:00
commit 40b48e92b9
9 files changed
+20 -6

No files matched your search

+1
View File
@@ -187,6 +187,7 @@ CREATE TABLE IF NOT EXISTS `g5_config` (
`cf_title` varchar(255) NOT NULL DEFAULT '',
`cf_admin` varchar(255) NOT NULL DEFAULT '',
`cf_admin_email` varchar(255) NOT NULL DEFAULT '',
`cf_admin_email_name` varchar(255) NOT NULL DEFAULT '',
`cf_include_index` varchar(255) NOT NULL DEFAULT '',
`cf_include_head` varchar(255) NOT NULL DEFAULT '',
`cf_include_tail` varchar(255) NOT NULL DEFAULT '',