Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/ch/unibas/dmi/dbis/cs108/gamelogic/Game.java
#	src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/chat/ChatApp.java
This commit is contained in:
Jonas
2022-04-18 22:42:09 +02:00
23 changed files with 279 additions and 75 deletions

View File

@@ -8,7 +8,7 @@ import org.apache.logging.log4j.core.config.Configuration;
import org.apache.logging.log4j.core.config.LoggerConfig;
/**
*
*A Class that lets us set the RootLogger Level of all Classes in this Project
*/
public class BudaLogConfig {