From c9487d48d180ed19baceec89c93ccb27add21fe5 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Mon, 6 May 2013 13:12:06 +0900
Subject: [PATCH] =?UTF-8?q?merge=20=EC=B6=A9=EB=8F=8C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 shop/item.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/shop/item.php b/shop/item.php
index 8c51af44f..8203a6927 100644
--- 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