# Conflicts:
#	app/views/projects/blob/_header.html.haml
#	app/views/projects/tree/_tree_header.html.haml
#	ee/app/assets/javascripts/ide/components/commit_sidebar/list.vue
#	ee/app/assets/javascripts/ide/components/commit_sidebar/list_collapsed.vue
#	ee/app/assets/javascripts/ide/components/ide.vue
#	ee/app/assets/javascripts/ide/components/ide_context_bar.vue
#	ee/app/assets/javascripts/ide/components/ide_project_branches_tree.vue
#	ee/app/assets/javascripts/ide/components/ide_project_tree.vue
#	ee/app/assets/javascripts/ide/components/ide_repo_tree.vue
#	ee/app/assets/javascripts/ide/components/ide_side_bar.vue
#	ee/app/assets/javascripts/ide/components/ide_status_bar.vue
#	ee/app/assets/javascripts/ide/components/new_branch_form.vue
#	ee/app/assets/javascripts/ide/components/new_dropdown/index.vue
#	ee/app/assets/javascripts/ide/components/new_dropdown/modal.vue
#	ee/app/assets/javascripts/ide/components/new_dropdown/upload.vue
#	ee/app/assets/javascripts/ide/components/repo_edit_button.vue
#	ee/app/assets/javascripts/ide/components/repo_editor.vue
#	ee/app/assets/javascripts/ide/components/repo_file.vue
#	ee/app/assets/javascripts/ide/components/repo_file_buttons.vue
#	ee/app/assets/javascripts/ide/components/repo_loading_file.vue
#	ee/app/assets/javascripts/ide/components/repo_prev_directory.vue
#	ee/app/assets/javascripts/ide/components/repo_preview.vue
#	ee/app/assets/javascripts/ide/components/repo_tab.vue
#	ee/app/assets/javascripts/ide/components/repo_tabs.vue
#	ee/app/assets/javascripts/ide/ide_router.js
#	ee/app/assets/javascripts/ide/index.js
#	ee/app/assets/javascripts/ide/lib/common/disposable.js
#	ee/app/assets/javascripts/ide/lib/common/model.js
#	ee/app/assets/javascripts/ide/lib/common/model_manager.js
#	ee/app/assets/javascripts/ide/lib/decorations/controller.js
#	ee/app/assets/javascripts/ide/lib/diff/controller.js
#	ee/app/assets/javascripts/ide/lib/diff/diff.js
#	ee/app/assets/javascripts/ide/lib/diff/diff_worker.js
#	ee/app/assets/javascripts/ide/lib/editor.js
#	ee/app/assets/javascripts/ide/monaco_loader.js
#	ee/app/assets/javascripts/ide/services/index.js
#	ee/app/assets/javascripts/ide/stores/actions/branch.js
#	ee/app/assets/javascripts/ide/stores/actions/file.js
#	ee/app/assets/javascripts/ide/stores/actions/project.js
#	ee/app/assets/javascripts/ide/stores/actions/tree.js
#	ee/app/assets/javascripts/ide/stores/getters.js
#	ee/app/assets/javascripts/ide/stores/index.js
#	ee/app/assets/javascripts/ide/stores/mutation_types.js
#	ee/app/assets/javascripts/ide/stores/mutations.js
#	ee/app/assets/javascripts/ide/stores/mutations/branch.js
#	ee/app/assets/javascripts/ide/stores/mutations/file.js
#	ee/app/assets/javascripts/ide/stores/mutations/project.js
#	ee/app/assets/javascripts/ide/stores/mutations/tree.js
#	ee/app/assets/javascripts/ide/stores/state.js
#	ee/app/assets/javascripts/ide/stores/utils.js
#	ee/app/views/ide/index.html.haml
#	ee/spec/features/projects/tree/create_directory_spec.rb
#	ee/spec/features/projects/tree/create_file_spec.rb
#	ee/spec/features/projects/tree/upload_file_spec.rb
#	lib/gitlab/verify/lfs_objects.rb
#	lib/gitlab/verify/uploads.rb
#	spec/factories/lfs_objects.rb
#	spec/javascripts/ide/components/commit_sidebar/list_collapsed_spec.js
#	spec/javascripts/ide/components/commit_sidebar/list_item_spec.js
#	spec/javascripts/ide/components/commit_sidebar/list_spec.js
#	spec/javascripts/ide/components/ide_context_bar_spec.js
#	spec/javascripts/ide/components/ide_repo_tree_spec.js
#	spec/javascripts/ide/components/ide_side_bar_spec.js
#	spec/javascripts/ide/components/ide_spec.js
#	spec/javascripts/ide/components/new_branch_form_spec.js
#	spec/javascripts/ide/components/new_dropdown/index_spec.js
#	spec/javascripts/ide/components/new_dropdown/modal_spec.js
#	spec/javascripts/ide/components/new_dropdown/upload_spec.js
#	spec/javascripts/ide/components/repo_edit_button_spec.js
#	spec/javascripts/ide/components/repo_file_buttons_spec.js
#	spec/javascripts/ide/components/repo_file_spec.js
#	spec/javascripts/ide/components/repo_loading_file_spec.js
#	spec/javascripts/ide/components/repo_prev_directory_spec.js
#	spec/javascripts/ide/components/repo_preview_spec.js
#	spec/javascripts/ide/components/repo_tab_spec.js
#	spec/javascripts/ide/components/repo_tabs_spec.js
#	spec/javascripts/ide/lib/common/disposable_spec.js
#	spec/javascripts/ide/lib/common/model_manager_spec.js
#	spec/javascripts/ide/lib/common/model_spec.js
#	spec/javascripts/ide/lib/decorations/controller_spec.js
#	spec/javascripts/ide/lib/diff/controller_spec.js
#	spec/javascripts/ide/lib/diff/diff_spec.js
#	spec/javascripts/ide/lib/editor_options_spec.js
#	spec/javascripts/ide/lib/editor_spec.js
#	spec/javascripts/ide/monaco_loader_spec.js
#	spec/javascripts/ide/stores/actions/branch_spec.js
#	spec/javascripts/ide/stores/actions/file_spec.js
#	spec/javascripts/ide/stores/actions/tree_spec.js
#	spec/javascripts/ide/stores/getters_spec.js
#	spec/javascripts/ide/stores/mutations/branch_spec.js
#	spec/javascripts/ide/stores/mutations/file_spec.js
#	spec/javascripts/ide/stores/mutations/tree_spec.js
#	spec/javascripts/ide/stores/mutations_spec.js
#	spec/javascripts/ide/stores/utils_spec.js

[ci skip]