Skip to content

G
gitlab-ce
Commit f7c2f348 authored by Stan Hu's avatar Stan Hu
Browse files
Options

Resolve conflicts in app/controllers/projects/autocomplete_sources_controller.rb

parent c14af009
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
app/controllers/projects/autocomplete_sources_controller.rb
View file @ f7c2f348
# frozen_string_literal: true # frozen_string_literal: true
class Projects::AutocompleteSourcesController < Projects::ApplicationController class Projects::AutocompleteSourcesController < Projects::ApplicationController
<<<<<<< HEAD
prepend EE::Projects::AutocompleteSourcesController prepend EE::Projects::AutocompleteSourcesController
=======
>>>>>>> upstream/master
def members def members
render json: ::Projects::ParticipantsService.new(@project, current_user).execute(target) render json: ::Projects::ParticipantsService.new(@project, current_user).execute(target)
end end
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7