# Conflicts:
#	app/models/repository.rb
#	app/views/projects/settings/repository/show.html.haml
#	doc/api/discussions.md
#	lib/api/discussions.rb
#	lib/api/helpers/notes_helpers.rb
#	lib/gitlab/utils.rb
#	spec/requests/api/discussions_spec.rb
#	spec/requests/api/notes_spec.rb

[ci skip]