From: Gustavo Martin Morcuende <gu.martinm@gmail.com>
Date: Sat, 19 Dec 2015 15:18:04 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/gumartinm/SpringWebServicesForFun
X-Git-Url: https://git.gumartinm.name/?a=commitdiff_plain;h=e05f0f250cc89a5816f702cf79ba59d20b3a02b6;p=SpringWebServicesForFun%2F.git

Merge branch 'master' of https://github.com/gumartinm/SpringWebServicesForFun

Conflicts:
	cxf/web-services-spring-cxf-client/src/main/resources/log4j2.xml
	jaxb2/web-services-spring-jaxb2-client/src/main/resources/log4j2.xml
---

e05f0f250cc89a5816f702cf79ba59d20b3a02b6
diff --cc jaxb2/web-services-spring-jaxb2-client/src/main/resources/log4j2.xml
index 5bbca37,bcb7346..1bf2492
--- a/jaxb2/web-services-spring-jaxb2-client/src/main/resources/log4j2.xml
+++ b/jaxb2/web-services-spring-jaxb2-client/src/main/resources/log4j2.xml
@@@ -58,4 -58,4 +58,4 @@@
              <AppenderRef ref="STDOUT"/>
          </Root>
      </Loggers>
--</Configuration>
++</Configuration>