관리자: 따옴표 등 작업

2012-12-26 21:19:19 +09:00
parent 32669ce3f3
commit f71c5ef21f
6 changed files with 38 additions and 18 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
    <h1><?=$config['cf_title']?></h1>
-=======
-    <? if (!isset($bo_table)) {?><h1><?=$g4['title']?></h1><? } ?>
->>>>>>> e7b5429b4b7a43150b180dc9efa62eaf13e8b6f7
 </header>

 <div>