merge 충돌 수정

2013-05-06 13:12:06 +09:00
parent a9e551e754
commit c9487d48d1
1 changed files with 0 additions and 4 deletions
--- a/shop/item.php
+++ b/shop/item.php
@ -132,7 +132,6 @@ $row = sql_fetch($sql);
 $item_relation_count = $row['cnt'];
 ?>

-<<<<<<< HEAD
 <?php
 function pg_anchor($anc_id) {
    global $default;
@ -147,9 +146,6 @@ function pg_anchor($anc_id) {
            </ul>
 <?php } ?>

-<script src="<?php echo G4_JS_URL; ?>/shop.js"></script>
-=======
->>>>>>> e996e707806fc6f359cb4e91fb92d84e4386e022
 <script src="<?php echo G4_JS_URL; ?>/md5.js"></script>

 <?php