Mercurial > hg > ConflictEditor
comparison conflict-editor/src/test/resources/log4j.properties @ 0:6f11757c4811
first drop of the conflict editor - mostly model work
author | Dirk Olmes <dirk@xanthippe.ping.de> |
---|---|
date | Mon, 12 Sep 2011 11:47:48 +0200 |
parents | |
children |
comparison
equal
deleted
inserted
replaced
-1:000000000000 | 0:6f11757c4811 |
---|---|
1 | |
2 # The usual stuff. Note that A1 is configured in root, not separately | |
3 log4j.rootCategory = DEBUG, A1 | |
4 log4j.appender.A1 = org.apache.log4j.ConsoleAppender | |
5 log4j.appender.A1.layout = org.apache.log4j.PatternLayout | |
6 #log4j.appender.A1.layout.ConversionPattern = %d{MMM dd HH:mm:ss} [%t] %p %c - %m%n | |
7 log4j.appender.A1.layout.ConversionPattern = %c{1} - %m%n |