fix conflict

lor6 · lor6 · commit 3946260278b4 · 2019-05-23T20:23:14.000+03:00
diff --git a/core-java-modules/core-java-9/src/modules/com.baeldung.logging.slf4j/com/baeldung/logging/slf4j/Slf4jLogger.java b/core-java-modules/core-java-9/src/modules/com.baeldung.logging.slf4j/com/baeldung/logging/slf4j/Slf4jLogger.java
@@ -75,6 +75,8 @@ public void log(Level level, ResourceBundle bundle, String format, Object... par
             return;
         }
 
+        String message = MessageFormat.format(format, params);
+
         switch (level) {
         case TRACE:
             logger.trace(format, params);

Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,8 @@ public void log(Level level, ResourceBundle bundle, String format, Object... par`
`75`	`75`	`return;`
`76`	`76`	`}`
`77`	`77`
	`78`	`+ String message = MessageFormat.format(format, params);`
	`79`	`+`
`78`	`80`	`switch (level) {`
`79`	`81`	`case TRACE:`
`80`	`82`	`logger.trace(format, params);`