SNS 수정중

2013-05-24 09:22:06 +09:00
parent c350f65613
commit 35e7f6ff10
64 changed files with 2348 additions and 956 deletions
--- a/lib/common.lib.php
+++ b/lib/common.lib.php
@ -998,17 +998,10 @@ function get_sideview($mb_id, $name='', $email='', $homepage='')
                if ($config['cf_use_member_icon'] == 2) // 회원아이콘+이름
                    $tmp_name = $tmp_name.' '.$name;
            } else { 
-<<<<<<< HEAD
                  $tmp_name = $tmp_name." ".$name; 
            } 
-        } else {
-            $tmp_name = $tmp_name.' '.$name;
-=======
-                $tmp_name = $tmp_name.' '.$name; 
-            } 
        } else { 
            $tmp_name = $tmp_name.' '.$name; 
->>>>>>> master
        }
        $tmp_name .= '</a>';