g5 merge 충돌 수정

2013-09-13 15:22:15 +09:00
parent 0f78b67eb7 5d332663d6
commit 8c0d61e772
55 changed files with 818 additions and 302 deletions
--- a/install/index.php
+++ b/install/index.php
@ -1,6 +1,6 @@
 <?php
-$title = "그누보드4s 설치 3단계 중 1단계 라이센스 확인";
 include_once ('../config.php');
+$title = G5_VERSION." 설치 3단계 중 1단계 라이센스 확인";
 include_once ('./install.inc.php');
 ?>

@ -17,7 +17,7 @@ if ($exists_data_dir && $write_data_dir) {
 <form action="./install_config.php" method="post" onsubmit="return frm_submit(this);">
 <div id="idx_agree">
    <label for="agree">동의합니다.</label>
-    <input type="checkbox" id="agree" name="agree" value="동의함"> 
+    <input type="checkbox" id="agree" name="agree" value="동의함">
 </div>

 <div id="btn_confirm">