Merge origin/master

Conflicts:
	src/wuerfelthreads/Start.java
	src/wuerfelthreads/view/WuerfelView.form
	src/wuerfelthreads/view/WuerfelView.java
This commit is contained in:
BakeOrDie 2020-12-23 12:05:23 +01:00
parent b71a6cf6b2
commit 1cc2478b2b

View File

@ -82,7 +82,7 @@ public class ChatModel implements Runnable
try try
{ {
msg = (List<Figure>)objectInput.readObject(); msg = (List<Figure>)objectInput.readObject();
lg.info("Nachricht empfangen" + String.valueOf(msg.size())); lg.info("Nachricht empfangen: " + String.valueOf(msg.size()));
} }
catch (ClassNotFoundException ex) catch (ClassNotFoundException ex)
{ {