From 2a51368e0ea89805ecefe34c8185111e6313bff1 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Fri, 14 Jun 2013 17:22:28 +0900
Subject: [PATCH] =?UTF-8?q?=EC=82=AC=EC=9A=A9=ED=9B=84=EA=B8=B0=EB=B6=80?=
 =?UTF-8?q?=EB=B6=84=20=EC=B6=A9=EB=8F=8C=20=EC=BD=94=EB=93=9C=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/shop_admin/index.php | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/adm/shop_admin/index.php b/adm/shop_admin/index.php
index 6148f9489..3f68c43e9 100644
--- a/adm/shop_admin/index.php
+++ b/adm/shop_admin/index.php
@@ -158,11 +158,7 @@ $pg_anchor = '<ul class="anchor">
     </thead>
     <tbody>
     <?php
-<<<<<<< HEAD
     $sql = " select * from {$g4[shop_item_use_table]}
-=======
-    $sql = " select * from {$g4['shop_item_ps_table']}
->>>>>>> master
               where is_confirm = 0
               order by is_id desc
               limit $max_limit ";
@@ -177,11 +173,7 @@ $pg_anchor = '<ul class="anchor">
     <tr>
         <td class="td_name"><?php echo $name; ?></td>
         <td><?php echo cut_str($row['is_subject'],40); ?></td>
-<<<<<<< HEAD
         <td class="td_smallmng"><a href="./itemuseform.php?w=u&amp;is_id=<?php echo $row['is_id']; ?>"><img src="./img/icon_mod.jpg" alt="<?php cut_str($row['is_subject'],40); ?> 수정"></a></td>
-=======
-        <td class="td_smallmng"><a href="./itempsform.php?w=u&amp;is_id=<?php echo $row['is_id']; ?>">수정</a></td>
->>>>>>> master
     </tr>
     <?php
     }