# Conflicts:
#	client/src/main/java/dev/fitko/fitconnect/api/config/http/HttpConfig.java
#	client/src/main/java/dev/fitko/fitconnect/client/bootstrap/ClientFactory.java
#	client/src/main/java/dev/fitko/fitconnect/core/http/DefaultHttpClient.java
#	client/src/test/java/dev/fitko/fitconnect/core/http/DefaultHttpClientTest.java
#	config.yml
#	integration-tests/src/test/java/dev/fitko/fitconnect/integrationtests/RoutingIT.java
#	pom.xml