From 3897a451f64f761050a525fa6a0671661293f504 Mon Sep 17 00:00:00 2001
From: SIR <admin@sir.co.kr>
Date: Fri, 14 Feb 2014 12:04:17 +0900
Subject: [PATCH] =?UTF-8?q?=EB=8B=A4=EC=9D=8C=20=EC=87=BC=ED=95=91?=
 =?UTF-8?q?=ED=95=98=EC=9A=B0=20=EC=BD=94=EB=93=9C=20=EC=B6=A9=EB=8F=8C=20?=
 =?UTF-8?q?=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 shop/price/daum.php | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/shop/price/daum.php b/shop/price/daum.php
index 72615bd1d..c8db5de46 100644
--- a/shop/price/daum.php
+++ b/shop/price/daum.php
@@ -1,15 +1,10 @@
 <?php
 include_once('./_common.php');
 
-<<<<<<< HEAD
+
 
 ob_start(); 
 
-
-=======
-ob_start();
-
->>>>>>> c20a7d3a84ad0dfc9546328cfd16cba8b3e9f556
 header("Content-Type: text/html; charset=utf-8");
 
 /*
@@ -149,20 +144,11 @@ for ($i=0; $row=sql_fetch_array($result); $i++)
 HEREDOC;
 }
 
-<<<<<<< HEAD
+
 
 $content = ob_get_contents(); 
 ob_end_clean(); 
 
 $content = iconv('utf-8', 'euc-kr', $content); 
 echo $content; 
-=======
-$content = ob_get_contents();
-ob_end_clean();
-
-// 131227 : 쇼핑하우에서는 아직 utf-8 을 지원하지 않고 있음
-$content = iconv('utf-8', 'euc-kr', $content);
-
-echo $content;
->>>>>>> c20a7d3a84ad0dfc9546328cfd16cba8b3e9f556
 ?>
\ No newline at end of file