g5 merge 충돌 수정

2014-05-29 10:25:46 +09:00
parent aaeb725145 38f209a57d
commit 40b48e92b9
9 changed files with 20 additions and 6 deletions
--- a/install/install_db.php
+++ b/install/install_db.php
@ -117,6 +117,7 @@ if($g5_install || !$result) {
                set cf_title = '".G5_VERSION."',
                    cf_admin = '$admin_id',
                    cf_admin_email = '$admin_email',
+                    cf_admin_email_name = '".G5_VERSION."',
                    cf_use_point = '1',
                    cf_use_copy_log = '1',
                    cf_login_point = '100',