Resolve conflict for group view

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

app/views/groups/show.html.haml

@@ -5,44 +5,6 @@
   - if current_user
     = auto_discovery_link_tag(:atom, group_url(@group, format: :atom, private_token: current_user.private_token), title: "#{@group.name} activity")
 
-<<<<<<< HEAD
-.dashboard
-  .header-with-avatar.clearfix
-    = image_tag group_icon(@group), class: "avatar group-avatar s90"
-    %h3
-      = @group.name
-    .username
-      @#{@group.path}
-    - if @group.description.present?
-      .description
-        = markdown(@group.description, pipeline: :description)
-  %hr
-
-  = render 'shared/show_aside'
-
-  - if can?(current_user, :read_group, @group)
-    .row
-      %section.activities.col-md-7
-        .hidden-xs
-          - if current_user
-            = render "events/event_last_push", event: @last_push
-            .pull-right
-              = link_to group_path(@group, { format: :atom, private_token: current_user.private_token }), title: "Feed", class: 'btn rss-btn' do
-                %i.fa.fa-rss
-
-            = render 'shared/event_filter'
-            %hr
-
-        .content_list
-        = spinner
-      %aside.side.col-md-5
-        = render "projects", projects: @projects
-        %br
-        = render "shared_projects", projects: @shared_projects
-  - else
-    %p
-      This group does not have public projects
-=======
 .cover-block
   .avatar-holder
     = link_to group_icon(@group), target: '_blank' do
@@ -66,6 +28,10 @@
       %li
         = link_to "#projects", 'data-toggle' => 'tab' do
           Projects
+    - if @shared_projects.present?
+      %li
+        = link_to "#shared", 'data-toggle' => 'tab' do
+          Shared Projects
 
   .tab-content
     .tab-pane.active#activity
@@ -83,8 +49,9 @@
 
     .tab-pane#projects
       = render "projects", projects: @projects
+    .tab-pane#shared
+      = render "shared_projects", projects: @shared_projects
 
 - else
   %p
     This group does not have public projects
->>>>>>> master