# Conflicts:
#	.travis.yml
#	composer.json
#	phpstan.neon
#	src/Kdyby/Doctrine/Collections/LazyCollection.php
#	src/Kdyby/Doctrine/Collections/ReadOnlyCollectionWrapper.php
#	src/Kdyby/Doctrine/Console/CommandHelper.php
#	src/Kdyby/Doctrine/Console/GenerateProxiesCommand.php
#	src/Kdyby/Doctrine/Console/Proxy/SchemaDropCommand.php
#	src/Kdyby/Doctrine/Console/Proxy/ValidateSchemaCommand.php
#	src/Kdyby/Doctrine/Console/ValidateSchemaCommand.php
#	src/Kdyby/Doctrine/DI/OrmExtension.php
#	src/Kdyby/Doctrine/Diagnostics/Panel.php
#	src/Kdyby/Doctrine/Dql/Condition.php
#	src/Kdyby/Doctrine/Dql/DqlBuilder.php
#	src/Kdyby/Doctrine/Dql/Join.php
#	src/Kdyby/Doctrine/DqlSelection.php
#	src/Kdyby/Doctrine/Entities/BaseEntity.php
#	src/Kdyby/Doctrine/Entities/IdentifiedEntity.php
#	src/Kdyby/Doctrine/Entities/MagicAccessors.php
#	src/Kdyby/Doctrine/EntityDao.php
#	src/Kdyby/Doctrine/EntityManager.php
#	src/Kdyby/Doctrine/EntityRepository.php
#	src/Kdyby/Doctrine/Geo/Coordinates.php
#	src/Kdyby/Doctrine/Geo/Element.php
#	src/Kdyby/Doctrine/Helpers.php
#	src/Kdyby/Doctrine/Mapping/AnnotationDriver.php
#	src/Kdyby/Doctrine/QueryObject.php
#	src/Kdyby/Doctrine/RepositoryFactory.php
#	src/Kdyby/Doctrine/ResultSet.php
#	src/Kdyby/Doctrine/Tools/RobotLoader.php
#	src/Kdyby/Doctrine/Types/GeometryType.php
#	src/Kdyby/Doctrine/exceptions.php
#	src/Kdyby/Persistence/ObjectDao.php
#	tests/KdybyTests/Doctrine/AnnotationDriver.phpt
#	tests/KdybyTests/Doctrine/Condition.phpt
#	tests/KdybyTests/Doctrine/Connection.phpt
#	tests/KdybyTests/Doctrine/Console/CommandTestCase.php
#	tests/KdybyTests/Doctrine/Console/GenerateEntitiesCommand.phpt
#	tests/KdybyTests/Doctrine/Console/ValidateSchemaCommand.phpt
#	tests/KdybyTests/Doctrine/Diagnostics/SimpleParameterFormatter.phpt
#	tests/KdybyTests/Doctrine/DqlSelection.phpt
#	tests/KdybyTests/Doctrine/EntityDao.phpt
#	tests/KdybyTests/Doctrine/Events.compatibility.phpt
#	tests/KdybyTests/Doctrine/Extension.phpt
#	tests/KdybyTests/Doctrine/Geo/Element.phpt
#	tests/KdybyTests/Doctrine/GeoElement.phpt
#	tests/KdybyTests/Doctrine/GeometryType.phpt
#	tests/KdybyTests/Doctrine/MagicAccesors.phpt
#	tests/KdybyTests/Doctrine/NonLockingUniqueInserter.phpt
#	tests/KdybyTests/Doctrine/ORMTestCase.php
#	tests/KdybyTests/Doctrine/TargetEntityMapping.phpt
#	tests/KdybyTests/Doctrine/config/entity-provider-merging.neon
#	tests/KdybyTests/Doctrine/models/readonly.php
#	tests/KdybyTests/Doctrine/proxies-sessions-test/run.php
#	tests/KdybyTests/nette-reset.neon