관리자: 변수 상수 제외 홑따옴표

2012-12-26 14:47:34 +09:00
parent a441937076
commit b023c3414d
55 changed files with 594 additions and 598 deletions
--- a/head.php
+++ b/head.php
@ -39,11 +39,7 @@ include_once($g4['path'].'/lib/popular.lib.php');
        <input type="submit" value="검색">
    </fieldset>
    </form>
-<<<<<<< HEAD
-    <? if (!isset($bo_table)) {?><h1><?=$g4['title']?></h1><? } ?>
-=======
    <h1><?=$config['cf_title']?></h1>
->>>>>>> c6d75730d63bbcb65a6e77baf559a24b33fb43c1
 </header>

 <div>