merge 충돌 처리

2013-06-13 11:31:56 +09:00
parent c0d2b4ca7d
commit 80c20cc73f
36 changed files with 399 additions and 398 deletions
--- a/shop/content.php
+++ b/shop/content.php
@ -57,7 +57,7 @@ if (file_exists($himg)) // 상단 이미지
    echo '<div id="socc_himg" class="socc_img"><img src="'.G4_DATA_URL.'/content/'.$co_id.'_h" alt=""></div>';
 ?>

-<article id="socc" class="socc_<?=$co_id?>">
+<article id="socc" class="socc_<?php echo $co_id; ?>">
    <header>
        <h1><?php echo $g4['title']; ?></h1>
    </header>