Resolve merge conflict for _tree_content.html.haml

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 }
-=======
-.tree-content-holder.js-tree-content{ 'data-logs-path': @logs_path }
->>>>>>> upstream/master
   .table-holder.bordered-box
     %table.table#tree-slider{ class: "table_#{@hex_path} tree-table qa-file-tree" }
       %thead