g5 merge 충돌수정
This commit is contained in:
@ -96,6 +96,7 @@ if($g5_install || !$result) {
|
|||||||
$sql = " insert into `{$table_prefix}config`
|
$sql = " insert into `{$table_prefix}config`
|
||||||
set cf_title = '".G5_VERSION."',
|
set cf_title = '".G5_VERSION."',
|
||||||
cf_admin = '$admin_id',
|
cf_admin = '$admin_id',
|
||||||
|
cf_admin_email = '$admin_email',
|
||||||
cf_use_point = '1',
|
cf_use_point = '1',
|
||||||
cf_use_norobot = '1',
|
cf_use_norobot = '1',
|
||||||
cf_use_copy_log = '1',
|
cf_use_copy_log = '1',
|
||||||
|
|||||||
Reference in New Issue
Block a user