# Conflicts:
#	app/assets/javascripts/boards/components/board_sidebar.js
#	app/assets/javascripts/boards/components/issue_card_inner.js
#	app/assets/javascripts/ide/components/repo_commit_section.vue
#	app/assets/javascripts/merge_conflicts/components/inline_conflict_lines.js
#	app/assets/javascripts/merge_conflicts/components/parallel_conflict_lines.js
#	app/assets/javascripts/pipelines/components/graph/stage_column_component.vue
#	app/assets/javascripts/sidebar/components/time_tracking/comparison_pane.vue
#	app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue
#	app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value_collapsed.vue
#	app/assets/javascripts/vue_shared/components/sidebar/toggle_sidebar.vue
#	app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_image.vue
#	doc/user/project/issue_board.md
#	doc/user/project/quick_actions.md
#	spec/services/quick_actions/interpret_service_spec.rb

[ci skip]