Resolve conflicts for branches, tags, commits list pages

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

app/views/projects/branches/index.html.haml

@@ -8,11 +8,9 @@
       Protected branches can be managed in project settings
 
     - if can? current_user, :push_code, @project
-<<<<<<< HEAD
+      .nav-controls
         = link_to new_namespace_project_branch_path(@project.namespace, @project), class: 'btn btn-create' do
-        = icon('plus')
           New branch
-      &nbsp;
         .dropdown.inline
           %button.dropdown-toggle.btn{type: 'button', 'data-toggle' => 'dropdown'}
             %span.light
@@ -29,39 +27,11 @@
                 = sort_title_recently_updated
               = link_to namespace_project_branches_path(sort: 'last_updated') do
                 = sort_title_oldest_updated
-  .oneline
-    Protected branches can be managed in project settings
 
-= render 'projects/commits/mirror_status'
+  = render 'projects/commits/mirror_status'
 
-- unless @branches.empty?
-  %ul.content-list.all-branches
-    - @branches.each do |branch|
-      = render "projects/branches/branch", branch: branch
-  = paginate @branches, theme: 'gitlab'
-=======
-      .nav-controls
-        = link_to new_namespace_project_branch_path(@project.namespace, @project), class: 'btn btn-create' do
-          New branch
-        .dropdown.inline
-          %button.dropdown-toggle.btn{type: 'button', 'data-toggle' => 'dropdown'}
-            %span.light
-            - if @sort.present?
-              = @sort.humanize
-            - else
-              Name
-            %b.caret
-          %ul.dropdown-menu.dropdown-menu-align-right
-            %li
-              = link_to namespace_project_branches_path(sort: nil) do
-                Name
-              = link_to namespace_project_branches_path(sort: 'recently_updated') do
-                = sort_title_recently_updated
-              = link_to namespace_project_branches_path(sort: 'last_updated') do
-                = sort_title_oldest_updated
   - unless @branches.empty?
     %ul.content-list.all-branches
       - @branches.each do |branch|
         = render "projects/branches/branch", branch: branch
     = paginate @branches, theme: 'gitlab'
->>>>>>> cea3cf177c68bb1fa9326d4e88631b7737ae8a98

app/views/projects/commits/show.html.haml

@@ -35,19 +35,12 @@
     %ul.breadcrumb.repo-breadcrumb
       = commits_breadcrumbs
 
-<<<<<<< HEAD
-= render 'projects/commits/mirror_status'
+  = render 'projects/commits/mirror_status'
 
-%div{id: dom_id(@project)}
-  #commits-list.content_list= render "commits", project: @project
-.clear
-= spinner
-=======
   %div{id: dom_id(@project)}
     #commits-list.content_list= render "commits", project: @project
   .clear
   = spinner
->>>>>>> cea3cf177c68bb1fa9326d4e88631b7737ae8a98
 
 :javascript
   CommitsList.init(#{@limit});

app/views/projects/tags/index.html.haml

@@ -7,20 +7,12 @@
     .nav-text
       Tags give the ability to mark specific points in history as being important
 
-<<<<<<< HEAD
-= render 'projects/commits/mirror_status'
-
-.tags
-  - unless @tags.empty?
-    %ul.content-list
-      - @tags.each do |tag|
-        = render 'tag', tag: @repository.find_tag(tag)
-=======
     - if can? current_user, :push_code, @project
       .nav-controls
         = link_to new_namespace_project_tag_path(@project.namespace, @project), class: 'btn btn-create new-tag-btn' do
           New tag
->>>>>>> cea3cf177c68bb1fa9326d4e88631b7737ae8a98
+
+  = render 'projects/commits/mirror_status'
 
   .tags
     - unless @tags.empty?