Merge origin/master

Conflicts: src/wuerfelthreads/Start.java src/wuerfelthreads/view/WuerfelView.form src/wuerfelthreads/view/WuerfelView.java
2020-12-09 11:42:40 +01:00 · 2020-12-09 11:42:40 +01:00 · af863d9514
commit af863d9514
parent 368575442f
2 changed files with 1 additions and 1 deletions
--- a/src/netz/view2/ChatView.form
+++ b/src/netz/view2/ChatView.form
--- a/src/netz/view2/ChatView.java
+++ b/src/netz/view2/ChatView.java
@ -3,7 +3,7 @@
 * To change this template file, choose Tools | Templates
 * and open the template in the editor.
 */
-package netz.view2;
+package netz.view;

 import netz.view.*;