# Conflicts:
#	api/src/main/java/dev/fitko/fitconnect/api/config/ApplicationConfig.java
#	api/src/main/java/dev/fitko/fitconnect/api/config/ResourcePaths.java
#	client/src/main/java/dev/fitko/fitconnect/client/bootstrap/ClientFactory.java
#	core/src/main/java/dev/fitko/fitconnect/core/events/EventLogApiService.java
#	core/src/main/java/dev/fitko/fitconnect/core/http/RestService.java
#	core/src/main/java/dev/fitko/fitconnect/core/http/UserAgentInterceptor.java
#	core/src/main/java/dev/fitko/fitconnect/core/schema/SchemaResourceProvider.java
#	core/src/main/java/dev/fitko/fitconnect/core/submission/SubmissionApiService.java
#	core/src/test/java/dev/fitko/fitconnect/core/http/ProxyRestTemplateTest.java
#	core/src/test/java/dev/fitko/fitconnect/core/http/RestServiceTest.java
#	core/src/test/java/dev/fitko/fitconnect/core/http/RestTemplateTest.java
#	integration-tests/src/test/java/dev/fitko/fitconnect/integrationtests/AuthenticationIT.java
#	integration-tests/src/test/java/dev/fitko/fitconnect/integrationtests/SubscriberClientIT.java
#	pom.xml