# Conflicts:
#	app/assets/javascripts/sidebar/sidebar_mediator.js
#	app/assets/stylesheets/pages/groups.scss
#	app/controllers/projects/merge_requests_controller.rb
#	app/models/epic.rb
#	app/models/user.rb
#	app/policies/group_policy.rb
#	app/services/ci/create_pipeline_service.rb
#	app/services/protected_branches/access_level_params.rb
#	app/services/protected_branches/api_service.rb
#	app/views/layouts/_search.html.haml
#	app/views/layouts/nav/sidebar/_group.html.haml
#	app/views/projects/commits/_commit.html.haml
#	app/views/projects/issues/show.html.haml
#	app/views/shared/_outdated_browser.html.haml
#	config/routes/group.rb
#	doc/administration/index.md
#	doc/administration/operations/index.md
#	doc/development/automatic_ce_ee_merge.md
#	doc/development/limit_ee_conflicts.md
#	lib/api/entities.rb
#	lib/api/projects.rb
#	lib/banzai/filter/epic_reference_filter.rb
#	lib/banzai/filter/upload_link_filter.rb
#	lib/banzai/reference_parser/epic_parser.rb
#	lib/gitlab/ci/pipeline/chain/command.rb
#	lib/gitlab/git_access.rb
#	lib/gitlab/utils.rb
#	spec/helpers/boards_helper_spec.rb
#	spec/helpers/merge_requests_helper_spec.rb
#	spec/javascripts/boards/boards_store_spec.js
#	spec/lib/banzai/filter/upload_link_filter_spec.rb
#	spec/lib/gitlab/ci/pipeline/chain/validate/abilities_spec.rb
#	spec/models/namespace_spec.rb

[ci skip]