Resolve lib/gitlab/git/repository.rb

lib/gitlab/git/repository.rb

@@ -1294,14 +1294,6 @@ module Gitlab
         success || gitlab_projects_error
       end
 
-<<<<<<< HEAD
-=======
-      def delete_remote_branches(remote_name, branch_names)
-        success = @gitlab_projects.delete_remote_branches(remote_name, branch_names)
-
-        success || gitlab_projects_error
-      end
-
       # rubocop:disable Metrics/ParameterLists
       def multi_action(
         user, branch_name:, message:, actions:,
@@ -1338,7 +1330,6 @@ module Gitlab
       end
       # rubocop:enable Metrics/ParameterLists
 
->>>>>>> upstream/master
       def gitaly_repository
         Gitlab::GitalyClient::Util.repository(@storage, @relative_path, @gl_repository)
       end