notice 오류 해결중

2012-12-26 15:02:42 +09:00
parent defca75c2c
commit e7b5429b4b
8 changed files with 109 additions and 114 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>