duerrha71912/chat_prog
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge origin/master

Browse Source 
Conflicts:
	src/wuerfelthreads/Start.java
	src/wuerfelthreads/view/WuerfelView.form
	src/wuerfelthreads/view/WuerfelView.java
This commit is contained in:
BakeOrDie 2020-12-09 11:28:56 +01:00
parent ea7e96b32c
commit 10128a50b0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/netz/Start.java
View File

@ -19,7 +19,7 @@ import netz.view.ChatView;
/** /**
* Builder Class * Builder Class
* @author le * @author chris, hd
*/ */
public class Start public class Start
{ {
@ -61,7 +61,7 @@ public class Start
} }
public static void main() public static void main(String[] args)
{ {
try try
{ {