From 1cc2478b2b7eaa353dbe7ef0483d691f4cc9240c Mon Sep 17 00:00:00 2001
From: BakeOrDie <chris.feichtenbeiner@t-online.de>
Date: Wed, 23 Dec 2020 12:05:23 +0100
Subject: [PATCH] Merge origin/master

Conflicts:
	src/wuerfelthreads/Start.java
	src/wuerfelthreads/view/WuerfelView.form
	src/wuerfelthreads/view/WuerfelView.java
---
 src/graphicChat/model/ChatModel.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/graphicChat/model/ChatModel.java b/src/graphicChat/model/ChatModel.java
index 45dd28d..b387641 100644
--- a/src/graphicChat/model/ChatModel.java
+++ b/src/graphicChat/model/ChatModel.java
@@ -82,7 +82,7 @@ public class ChatModel implements Runnable
         try
         {
          msg = (List<Figure>)objectInput.readObject();
-         lg.info("Nachricht empfangen" + String.valueOf(msg.size()));
+         lg.info("Nachricht empfangen: " + String.valueOf(msg.size()));
         }
         catch (ClassNotFoundException ex)
         {