Slavisa Baeldung 57ebe60697 Merge remote-tracking branch 'origin/pr/470' into pr/470-alexB-logging ...

Conflicts:
	log4j/pom.xml
	log4j/src/main/java/com/baeldung/log4j2/Log4j2Example.java
	log4j/src/main/java/com/baeldung/logback/LogbackExample.java
	log4j/src/main/resources/log4j.xml
	log4j/src/main/resources/log4j2.xml
	log4j/src/main/resources/logback.xml
	pom.xml

2016-07-08 09:51:18 +02:00

..

src/main

Merge remote-tracking branch 'origin/pr/470' into pr/470-alexB-logging

2016-07-08 09:51:18 +02:00

pom.xml

Merge remote-tracking branch 'origin/pr/470' into pr/470-alexB-logging

2016-07-08 09:51:18 +02:00