# Conflicts:
#	SAMO-Interface/pom.xml
#	SARIS-Interface/pom.xml
#	addressImport/pom.xml
#	deployment/dockercompose/gfi/configBackend/configMain/application.yml
#	deployment/dockercompose/gfi/docker-compose.yml
#	gfsBackendService/pom.xml
#	gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/controller/FailureInformationController.java
#	gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/service/ExportService.java
#	gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/service/FailureInformationService.java
#	mailExport/pom.xml
#	stoerungsauskunftInterface/pom.xml
#	testImportGridFailures/pom.xml