firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

충돌 해결

Browse Source
This commit is contained in:
gnuboard
2013-11-08 16:33:10 +09:00
parent 76602be986
commit b99775727c
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
shop/search.php
View File

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