From dd060fb3656aeb13587df63eec4c20def919f014 Mon Sep 17 00:00:00 2001
From: gnuboard <kagla@naver.com>
Date: Wed, 22 May 2013 14:27:10 +0900
Subject: [PATCH] =?UTF-8?q?=EB=B9=84=ED=9A=8C=EC=9B=90,=20=EC=95=84?=
 =?UTF-8?q?=EC=9D=B4=EC=BD=98=20=EC=82=AC=EC=9A=A9=EC=97=90=EC=84=9C=20?=
 =?UTF-8?q?=EC=82=AC=EC=9D=B4=EB=93=9C=EB=B7=B0=20=EC=A0=9C=EB=8C=80?=
 =?UTF-8?q?=EB=A1=9C=20=ED=91=9C=EC=8B=9C=EB=90=98=EC=A7=80=20=EC=95=8A?=
 =?UTF-8?q?=EB=8D=98=20=EC=98=A4=EB=A5=98=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 | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/lib/common.lib.php b/lib/common.lib.php
index cb3dff323..2114c3928 100644
--- a/lib/common.lib.php
+++ b/lib/common.lib.php
@@ -997,17 +997,11 @@ function get_sideview($mb_id, $name='', $email='', $homepage='')
 
                 if ($config['cf_use_member_icon'] == 2) // 회원아이콘+이름
                     $tmp_name = $tmp_name.' '.$name;
-<<<<<<< HEAD
-            }
-        } else {
-            $tmp_name = $tmp_name.' '.$name;
-=======
             } else { 
                 $tmp_name = $tmp_name.' '.$name; 
             } 
         } else { 
             $tmp_name = $tmp_name.' '.$name; 
->>>>>>> a51735e00ddf29bead8ea199ffa91d1234792320
         }
         $tmp_name .= '</a>';