# Conflicts:
#	app/assets/javascripts/boards/models/list.js
#	app/assets/javascripts/main.js
#	app/assets/stylesheets/pages/groups.scss
#	app/models/concerns/issuable.rb
#	app/models/prometheus_metric.rb
#	app/models/resource_label_event.rb
#	app/presenters/commit_status_presenter.rb
#	app/views/projects/project_members/index.html.haml
#	config/prometheus/common_metrics.yml
#	db/schema.rb
#	doc/api/resource_label_events.md
#	doc/development/prometheus_metrics.md
#	lib/api/entities.rb
#	lib/api/resource_label_events.rb
#	lib/gitlab/ci/status/build/failed.rb
#	lib/gitlab/import_export/import_export.yml
#	locale/gitlab.pot
#	spec/features/projects/members/invite_group_and_members_spec.rb
#	spec/features/projects/members/invite_group_spec.rb
#	spec/features/projects/members/share_with_group_spec.rb
#	spec/features/usage_stats_consent_spec.rb
#	spec/lib/gitlab/import_export/all_models.yml
#	spec/lib/gitlab/import_export/safe_model_attributes.yml
#	spec/requests/api/resource_label_events_spec.rb
#	yarn.lock

[ci skip]