# Conflicts:
#	app/assets/javascripts/ide/components/ide_project_tree.vue
#	app/assets/javascripts/ide/components/repo_file.vue
#	app/assets/javascripts/ide/ide_router.js
#	app/assets/javascripts/ide/stores/workers/files_decorator_worker.js
#	app/views/projects/tree/_tree_header.html.haml
#	config/webpack.config.js
#	db/schema.rb

[ci skip]