g4s merge 충돌 수정

This commit is contained in:
chicpro
2013-05-16 09:19:46 +09:00
56 changed files with 834 additions and 860 deletions

View File

@ -4,8 +4,8 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
<link rel="stylesheet" href="<?php echo $latest_skin_url ?>/style.css">
<div class="lat">
<strong class="lat_title"><a href="<?php echo G4_BBS_URL ?>/board.php?bo_table=<?php echo $bo_table ?>"><?php echo $bo_subject ?></a></strong>
<section class="lat">
<h2 class="lat_title"><a href="<?php echo G4_BBS_URL ?>/board.php?bo_table=<?php echo $bo_table ?>"><?php echo $bo_subject ?></a></h2>
<ul>
<?php for ($i=0; $i<count($list); $i++) { ?>
<li>
@ -38,4 +38,4 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
<?php } ?>
</ul>
<div class="lat_more"><a href="<?php echo G4_BBS_URL ?>/board.php?bo_table=<?php echo $bo_table ?>"><span class="sound_only"><?php echo $bo_subject ?></span>더보기</a></div>
</div>
</section>