From b99775727cb80b7f3a02555b46d3f02a3265c3fa Mon Sep 17 00:00:00 2001
From: gnuboard <kagla@naver.com>
Date: Fri, 8 Nov 2013 16:33:10 +0900
Subject: [PATCH] =?UTF-8?q?=EC=B6=A9=EB=8F=8C=20=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 shop/search.php | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/shop/search.php b/shop/search.php
index 464055789..498298c6a 100644
--- a/shop/search.php
+++ b/shop/search.php
@@ -75,14 +75,6 @@ $total_count = $row['cnt'];
 <!-- 검색결과 시작 { -->
 <div id="ssch">
 
-<<<<<<< HEAD
-    <!-- <div id="ssch_ov">검색어 <strong><?php echo ($q ? stripslashes(get_text($q)) : '없음'); ?></strong> | 검색 결과 <strong><?php echo $total_count; ?></strong>건</div> -->
-    <a href="#">판매량 많은순</a>
-    <a href="#">선호도 높은순</a>
-    <a href="#">사용후기 많은순</a>
-    <a href="#">최근 등록순</a>
-    검색 결과 <strong><?php echo $total_count; ?></strong>건
-=======
     <div id="ssch_frm">
         <form name="frmdetailsearch" onsubmit="return detail_search_submit(this);">
         상세검색 : 
@@ -98,8 +90,12 @@ $total_count = $row['cnt'];
         </form>
     </div>
 
-    <div id="ssch_ov">검색어 <strong><?php echo ($q ? stripslashes(get_text($q)) : '없음'); ?></strong> | 검색 결과 <strong><?php echo $total_count; ?></strong>건</div>
->>>>>>> 23fe590917161cae409fb47b3b92131921dd5c97
+    <!-- <div id="ssch_ov">검색어 <strong><?php echo ($q ? stripslashes(get_text($q)) : '없음'); ?></strong> | 검색 결과 <strong><?php echo $total_count; ?></strong>건</div> -->
+    <a href="#">판매량 많은순</a>
+    <a href="#">선호도 높은순</a>
+    <a href="#">사용후기 많은순</a>
+    <a href="#">최근 등록순</a>
+    검색 결과 <strong><?php echo $total_count; ?></strong>건
 
     <div>
         <?php