Merge branch 'master' of github.com:gnuboard/g4s

Conflicts: adm/admin.head.php head.php
2012-12-26 15:22:03 +09:00
parent a9423930ff e7b5429b4b
commit 32669ce3f3
7 changed files with 118 additions and 107 deletions
--- a/head.php
+++ b/head.php
@ -39,7 +39,11 @@ 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>