firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

merge

Browse Source
This commit is contained in:
whitedot
2012-12-27 17:32:04 +09:00
parent 12894d08dc 2b5c471bdb
commit ee344294d9
11 changed files with 85 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
adm/board_form.php
View File

@ -24,10 +24,17 @@ if ($w == '') {
$board['bo_count_delete'] = 1;
$board['bo_count_modify'] = 1;
<<<<<<< HEAD
$board['bo_read_point'] = $config[cf_read_point];
$board['bo_write_point'] = $config[cf_write_point];
$board['bo_comment_point'] = $config[cf_comment_point];
$board['bo_download_point'] = $config[cf_download_point];
=======
$board['bo_read_point'] = $config['cf_read_point'];
$board['bo_write_point'] = $config['cf_write_point'];
$board['bo_comment_point'] = $config['cf_comment_point'];
$board['bo_download_point'] = $config['cf_download_point'];
>>>>>>> 2b5c471bdb62542fc9cb8b6740a934c34e5de04b
$board['bo_gallery_cols'] = 4;
$board['bo_table_width'] = 97;