Merge remote-tracking branch 'origin/LabWork07' into LabWork08
# Conflicts: # Project/src/FormMapWithSetPlanesGeneric.java
This commit is contained in:
commit
28eafe6f61
@ -23,4 +23,4 @@ log4j.appender.adminAppender.filter.a.LevelMin=WARN
|
||||
log4j.appender.adminAppender.filter.a.LevelMax=FATAL
|
||||
log4j.appender.adminAppender.filter.a.AcceptOnMatch=TRUE
|
||||
log4j.appender.adminAppender.layout=org.apache.log4j.PatternLayout
|
||||
log4j.appender.adminAppender.layout.ConversionPattern=%-5p %c{1}:%L - %m %d{dd-MM-yyyy}%n
|
||||
log4j.appender.adminAppender.layout.ConversionPattern=%-5p %c{1}:%L - %m %d{dd-MM-yyyy}%n
|
||||
|
Loading…
Reference in New Issue
Block a user