From ad0a3d23d88707ca604fa9da236fb8f2b349d618 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Mon, 1 Jul 2013 17:17:25 +0900
Subject: [PATCH] =?UTF-8?q?=EC=B6=A9=EB=8F=8C=20=EC=BD=94=EB=93=9C=20?=
 =?UTF-8?q?=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 shop/orderform.php | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/shop/orderform.php b/shop/orderform.php
index f06b96997..012d74323 100644
--- a/shop/orderform.php
+++ b/shop/orderform.php
@@ -908,13 +908,6 @@ function get_intall_file()
         새로고침(F5) 한후에도 계속 설치파일이 다운로드 되거나 결제가 되지 않으면 브라우저를 새로 열어서 주문해 주시기 바랍니다.<br>
         브라우저가 익스플로러가 아닌 경우 Payplus Plug-in 설치에 문제가 있을수 있음을 알려 드립니다.
     </p>
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-=======
->>>>>>> 7c3b78792011aaf93dbbe968034d2ca094405b1f
-=======
->>>>>>> 7c3b78792011aaf93dbbe968034d2ca094405b1f
     <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>
@@ -1586,8 +1579,4 @@ include_once('./_tail.php');
 
 <script>
 CheckPayplusInstall();
-<<<<<<< HEAD
-</script>
-=======
-</script>
->>>>>>> 7c3b78792011aaf93dbbe968034d2ca094405b1f
+</script>
\ No newline at end of file