Resolve conflicts in lib/gitlab/git/repository.rb

3fe8a7a3 · Stan Hu · 658f517a · 3fe8a7a3
Commit 3fe8a7a3 authored Jan 24, 2018 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

lib/gitlab/git/repository.rb lib/gitlab/git/repository.rb +0 -3

No files found.
--- a/lib/gitlab/git/repository.rb
+++ b/lib/gitlab/git/repository.rb
@@ -1262,8 +1262,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)

@@ -1282,7 +1280,6 @@ module Gitlab
        true
      end

->>>>>>> upstream/master
      # rubocop:disable Metrics/ParameterLists
      def multi_action(
        user, branch_name:, message:, actions:,