Alex Aragon 9 лет назад
Родитель
Сommit
d08ab50b5c
2 измененных файлов с 0 добавлено и 23 удалено
  1. 0 15
      main/social/group_view.php
  2. 0 8
      main/template/default/social/group_view.tpl

+ 0 - 15
main/social/group_view.php

@@ -284,16 +284,8 @@ if ($is_group_member || $group_info['visibility'] == GROUP_PERMISSION_OPEN) {
         $create_thread_link =  Display::div($create_thread_link, array('class'=>'pull-right'));
     }
     $headers = array(get_lang('Discussions'), get_lang('Members'));
-<<<<<<< HEAD
-<<<<<<< HEAD
-    $social_right_content .= Display::tabs($headers, array($content, $member_content),'tabs');
-=======
     $socialForum = Display::tabs($headers, array($content, $member_content),'tabs');
     
->>>>>>> d97f940... fix css tpl groups topics CT#8161
-=======
-    $socialForum = Display::tabs($headers, array($content, $member_content),'tabs');
->>>>>>> 29d36f7... arranging menu display list groups CT#8161
 } else {
     // if I already sent an invitation message
     if (!in_array(
@@ -322,14 +314,7 @@ $tpl->assign('is_group_member', $is_group_member);
 $tpl->assign('group_info', $group_info);
 $tpl->assign('social_friend_block', $friend_html);
 $tpl->assign('social_menu_block', $social_menu_block);
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
 $tpl->assign('social_forum', $socialForum);
->>>>>>> d97f940... fix css tpl groups topics CT#8161
-=======
-$tpl->assign('social-forum', $socialForum);
->>>>>>> 29d36f7... arranging menu display list groups CT#8161
 $tpl->assign('social_right_content', $social_right_content);
 $social_layout = $tpl->get_template('social/group_view.tpl');
 $tpl->display($social_layout);

+ 0 - 8
main/template/default/social/group_view.tpl

@@ -44,10 +44,6 @@
                 {% endif %}
             </div>
         {% endif %}
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-=======
         
         <div class="group-info">
             <h2 class="title">{{ group_info.name }}</h2>
@@ -57,10 +53,6 @@
             {{ social_forum }}
         </div>
         
->>>>>>> d97f940... fix css tpl groups topics CT#8161
-=======
-        {{ social-forum }}
->>>>>>> 29d36f7... arranging menu display list groups CT#8161
         {{ social_right_content }}
 
         <div id="display_response_id" class="col-md-5"></div>