Resolve conflict in app/controllers/projects/refs_controller.rb

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

app/controllers/projects/refs_controller.rb

@@ -52,28 +52,19 @@ class Projects::RefsController < Projects::ApplicationController
     contents.push(*tree.blobs)
     contents.push(*tree.submodules)
 
-<<<<<<< HEAD
     show_path_locks = @project.feature_available?(:file_locks) && @project.path_locks.any?
 
-=======
->>>>>>> upstream/master
     # n+1: https://gitlab.com/gitlab-org/gitlab-ce/issues/37433
     @logs = Gitlab::GitalyClient.allow_n_plus_1_calls do
       contents[@offset, @limit].to_a.map do |content|
         file = @path ? File.join(@path, content.name) : content.name
         last_commit = @repo.last_commit_for_path(@commit.id, file)
-<<<<<<< HEAD
         path_lock = show_path_locks && @project.find_path_lock(file)
 
         {
           file_name: content.name,
           commit: last_commit,
           lock_label: path_lock && text_label_for_lock(path_lock, file)
-=======
-        {
-          file_name: content.name,
-          commit: last_commit
->>>>>>> upstream/master
         }
       end
     end