From 4afa4f99d869cfa49e25afcf838b16fed01f57bc Mon Sep 17 00:00:00 2001
From: gnuboard <kagla@naver.com>
Date: Fri, 28 Jun 2013 09:23:10 +0900
Subject: [PATCH] =?UTF-8?q?=EB=A8=B8=EC=A7=80=20=EC=B6=9C=EB=8F=99=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 shop/orderform.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/shop/orderform.php b/shop/orderform.php
index 0f99e7900..1ef6c7777 100644
--- a/shop/orderform.php
+++ b/shop/orderform.php
@@ -945,7 +945,6 @@ function get_intall_file()
         ?>
     </section>
 
-<<<<<<< HEAD
     <!-- Payplus Plug-in 설치 안내 -->
     <p id="display_setup_message" style="display:block">
         <span class="red">결제를 계속 하시려면 상단의 노란색 표시줄을 클릭</span>하시거나 <a href="https://pay.kcp.co.kr/plugin_new/file/KCPPluginSetup.exe" onclick="return get_intall_file();"><b><u>[수동설치]</u></b></a>를 눌러 다운로드 된 Payplus Plug-in을 설치하시기 바랍니다.<br>
@@ -954,8 +953,6 @@ function get_intall_file()
         브라우저가 익스플로러가 아닌 경우 Payplus Plug-in 설치에 문제가 있을수 있음을 알려 드립니다.
     </p>
 
-=======
->>>>>>> 225fa4a75dd51016367658455d6c416890c90b64
     <div id="display_pay_button" class="btn_confirm" style="display:none">
         <input type="submit" value="주문하기" class="btn_submit">
         <a href="javascript:history.go(-1);" class="btn01">취소</a>