Fixed conflict in app/views/projects/_home_panel.html.haml

app/views/projects/_home_panel.html.haml

@@ -16,13 +16,11 @@
           Forked from
           = link_to project_path(forked_from_project) do
             = forked_from_project.namespace.try(:name)
-
-<<<<<<< HEAD
       - if @project.mirror?
         - import_url = @project.safe_import_url
         %p
           Mirrored from #{link_to import_url, import_url}.
-
+          %br
           = render "shared/mirror_status"
 
     .project-repo-buttons.project-action-buttons
@@ -33,23 +31,5 @@
       .project-clone-holder
         = render "shared/clone_panel"
 
-      .project-repo-buttons.btn-group.project-right-buttons
-        - if current_user
-          .pull-left.append-right-10= render 'shared/members/access_request_buttons', source: @project
-
-        = render "projects/buttons/update_mirror"
-        = render "projects/buttons/download"
-        = render 'projects/buttons/dropdown'
-        = render 'shared/notifications/button', notification_setting: @notification_setting
-=======
-    .project-repo-buttons.project-action-buttons
-      .count-buttons
-        = render 'projects/buttons/star'
-        = render 'projects/buttons/fork'
-
-      .project-clone-holder
-        = render "shared/clone_panel"
->>>>>>> ce/master
-
 :javascript
   new Star();