From d3730f98333310629a0c8ae87ae6080fdc59ed62 Mon Sep 17 00:00:00 2001
From: rollydream <xgirl_87x@naver.com>
Date: Fri, 8 Mar 2013 15:11:08 +0900
Subject: [PATCH] =?UTF-8?q?=EC=84=A4=EC=B9=98:=20=EC=98=A4=EB=A5=98=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

---
 install/install_db.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/install/install_db.php b/install/install_db.php
index 777a56800..10570b2f6 100644
--- a/install/install_db.php
+++ b/install/install_db.php
@@ -124,7 +124,6 @@ $sql = " insert into `{$table_prefix}config`
                 cf_stipulation = '해당 홈페이지에 맞는 회원가입약관을 입력합니다.',
                 cf_privacy = '해당 홈페이지에 맞는 개인정보취급방침을 입력합니다.'
                 ";
->>>>>>> 58918b3528c5945215be90227f5d74759b172042
 mysql_query($sql) or die(mysql_error() . "<p>" . $sql);
 
 // 관리자 회원가입