Resolve conflict in app/views/projects/tree/_tree_content.html.haml

Based on d19eaaed2d48e008abf94301a98e8ee806219071.
Signed-off-by: Rémy Coutable <remy@rymai.me>

app/views/projects/tree/_tree_content.html.haml

-<<<<<<< HEAD
-.tree-content-holder.js-tree-content{ 'data-logs-path': @logs_path, 'data-path-locks-available': (@project.feature_available?(:file_locks) ? 'true' : 'false'), 'data-path-locks-toggle': toggle_project_path_locks_path(@project), 'data-path-locks-path': @path }
-  .table-holder
-    %table.table#tree-slider{ class: "table_#{@hex_path} tree-table" }
-      %thead
-        %tr
-          %th= s_('ProjectFileTree|Name')
-          %th.hidden-xs
-            .pull-left= _('Last commit')
-          %th.text-right= _('Last Update')
-      - if @path.present?
-        %tr.tree-item
-          %td.tree-item-file-name
-            = link_to "..", project_tree_path(@project, up_dir_path), class: 'prepend-left-10'
-          %td
-          %td.hidden-xs
-
-      = render_tree(tree)
-
-  - if tree.readme
-    = render "projects/tree/readme", readme: tree.readme
-
-- if can_edit_tree?
-  = render 'projects/blob/upload', title: _('Upload New File'), placeholder: _('Upload New File'), button_title: _('Upload file'), form_path: project_create_blob_path(@project, @id), method: :post
-  = render 'projects/blob/new_dir'
-=======
 - content_url = local_assigns.fetch(:content_url, nil)
 - if show_new_repo?
   = render 'shared/repo/repo', project: @project, content_url: content_url
 - else
   = render 'projects/tree/old_tree_content', tree: tree
->>>>>>> upstream/master