# Conflicts:
#	app/controllers/import/base_controller.rb
#	app/models/project_import_state.rb
#	db/schema.rb
#	lib/gitlab/background_migration/populate_import_state.rb
#	lib/gitlab/background_migration/rollback_import_state_data.rb
#	lib/gitlab/legacy_github_import/importer.rb
#	spec/factories/import_state.rb
#	spec/factories/projects.rb
#	spec/lib/gitlab/background_migration/populate_import_state_spec.rb
#	spec/lib/gitlab/background_migration/rollback_import_state_data_spec.rb
#	spec/lib/gitlab/import_export/all_models.yml
#	spec/migrations/migrate_import_attributes_data_from_projects_to_project_mirror_data_spec.rb

[ci skip]