From ea58637d619bd2412c62db7fe75c491ebfcd9bb4 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Mon, 13 May 2013 18:41:04 +0900
Subject: [PATCH] =?UTF-8?q?g4s=20=EB=A8=B8=EC=A7=80=20=EC=B6=A9=EB=8F=8C?=
 =?UTF-8?q?=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/common.lib.php | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/lib/common.lib.php b/lib/common.lib.php
index 9a8989202..00ae54b39 100644
--- a/lib/common.lib.php
+++ b/lib/common.lib.php
@@ -1987,16 +1987,8 @@ function hyphen_hp_number($hp)
 function login_url($url='')
 {
     if (!$url) $url = G4_URL;
-<<<<<<< HEAD
     //$p = parse_url($url);
     //return $url.urldecode(preg_replace("/^".urlencode($p['path'])."/", "", urlencode($_SERVER['REQUEST_URI'])));
-=======
-    /*
-    $p = parse_url($url);
-    echo urlencode($_SERVER['REQUEST_URI']);
-    return $url.urldecode(preg_replace("/^".urlencode($p['path'])."/", "", urlencode($_SERVER['REQUEST_URI'])));
-    */
->>>>>>> g4s
     return $url;
 }