g4s merge 충돌 수정

2013-06-26 12:04:11 +09:00
parent a49a7e9747 865035aff0
commit 8d8b107b70
9 changed files with 55 additions and 22 deletions
--- a/install/gnuboard4s.sql
+++ b/install/gnuboard4s.sql
@ -56,6 +56,7 @@ CREATE TABLE IF NOT EXISTS `g4s_board` (
  `bo_use_ip_view` tinyint(4) NOT NULL DEFAULT '0',
  `bo_use_trackback` tinyint(4) NOT NULL DEFAULT '0',
  `bo_use_list_view` tinyint(4) NOT NULL DEFAULT '0',
+  `bo_use_list_file` tinyint(4) NOT NULL DEFAULT '0',
  `bo_use_list_content` tinyint(4) NOT NULL DEFAULT '0',
  `bo_table_width` int(11) NOT NULL DEFAULT '0',
  `bo_subject_len` int(11) NOT NULL DEFAULT '0',