From 10128a50b0d7eb991b7748c41eb98d981730efc4 Mon Sep 17 00:00:00 2001
From: BakeOrDie <chris.feichtenbeiner@t-online.de>
Date: Wed, 9 Dec 2020 11:28:56 +0100
Subject: [PATCH] Merge origin/master

Conflicts:
	src/wuerfelthreads/Start.java
	src/wuerfelthreads/view/WuerfelView.form
	src/wuerfelthreads/view/WuerfelView.java
---
 src/netz/Start.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/netz/Start.java b/src/netz/Start.java
index 8713da0..6841e17 100755
--- a/src/netz/Start.java
+++ b/src/netz/Start.java
@@ -19,7 +19,7 @@ import netz.view.ChatView;
 
 /**
  * Builder Class
- * @author le
+ * @author chris, hd
  */
 public class Start
 {
@@ -61,7 +61,7 @@ public class Start
     
   }
 
-  public static void main() 
+  public static void main(String[] args) 
   {
     try
     {