slavisa-baeldung f508eccfdc BAEL - 318 - resolving conflicts		2017-04-23 08:50:57 +01:00
..
main	use standard logback.xml (#1666)	2017-04-17 18:41:23 +02:00
test	BAEL - 318 - resolving conflicts	2017-04-23 08:50:57 +01:00