merge 충돌 처리

2013-06-13 11:31:56 +09:00
parent c0d2b4ca7d
commit 80c20cc73f
36 changed files with 399 additions and 398 deletions
--- a/shop/ordercoupon.php
+++ b/shop/ordercoupon.php
@ -65,8 +65,5 @@ $count = mysql_num_rows($result);
    ?>
    <div class="btn_confirm">
        <button type="button" id="od_coupon_close" class="btn_submit">닫기</button>
-        <?php if($count > 0) { ?>
-        <button type="button" id="od_coupon_cancel" class="btn_cancel">쿠폰적용취소</button>
-        <?php } ?>
    </div>
 </div>