Conflicts:
	build.xml
	composer.json
	config/vufind/DAIA.ini
	config/vufind/HierarchyDefault.ini
	config/vufind/HierarchyFlat.ini
	import/marc.properties
	import/marc_local.properties
	module/VuFind/src/VuFind/Hierarchy/TreeDataSource/Solr.php
	module/VuFind/src/VuFind/I18n/Translator/Loader/ExtendedIni.php
	module/VuFind/src/VuFind/Search/Solr/MultiIndexListener.php
	module/VuFindConsole/src/VuFindConsole/Controller/UtilController.php
	solr/biblio/conf/schema.xml
	vendor/vufind-org/vufindhttp/src/VuFindHttp/HttpService.php