From c73b3f4224879c3315d93b8edcbf5183dc82a97a Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Fri, 18 Jan 2013 15:49:18 +0900
Subject: [PATCH] =?UTF-8?q?merge=EB=A1=9C=20=EC=83=9D=EC=84=B1=EB=90=9C=20?=
 =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bbs/memo_form_update.php | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/bbs/memo_form_update.php b/bbs/memo_form_update.php
index 0de46d095..f2326a366 100644
--- a/bbs/memo_form_update.php
+++ b/bbs/memo_form_update.php
@@ -2,17 +2,10 @@
 define('G4_CAPTCHA', 1);
 include_once('./_common.php');
 
-<<<<<<< HEAD
 if ($is_guest)
     alert('회원만 이용하실 수 있습니다.');
 
 if (!chk_captcha()) {
-=======
-if (!$is_member)
-    alert('회원만 이용하실 수 있습니다.');
-
-if ($is_guest && !chk_captcha()) {
->>>>>>> fca2c7be504cccbd5466136a893f3d3ed875554c
     alert('스팸방지에 입력한 숫자가 틀렸습니다.');
 }