Commit 3fe8a7a3 authored by Stan Hu's avatar Stan Hu

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

parent 658f517a
...@@ -1262,8 +1262,6 @@ module Gitlab ...@@ -1262,8 +1262,6 @@ module Gitlab
success || gitlab_projects_error success || gitlab_projects_error
end end
<<<<<<< HEAD
=======
def delete_remote_branches(remote_name, branch_names) def delete_remote_branches(remote_name, branch_names)
success = @gitlab_projects.delete_remote_branches(remote_name, branch_names) success = @gitlab_projects.delete_remote_branches(remote_name, branch_names)
...@@ -1282,7 +1280,6 @@ module Gitlab ...@@ -1282,7 +1280,6 @@ module Gitlab
true true
end end
>>>>>>> upstream/master
# rubocop:disable Metrics/ParameterLists # rubocop:disable Metrics/ParameterLists
def multi_action( def multi_action(
user, branch_name:, message:, actions:, user, branch_name:, message:, actions:,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment