From af863d95148cbe47db04337537fe8ec3bdd660a4 Mon Sep 17 00:00:00 2001 From: BakeOrDie Date: Wed, 9 Dec 2020 11:42:40 +0100 Subject: [PATCH] Merge origin/master Conflicts: src/wuerfelthreads/Start.java src/wuerfelthreads/view/WuerfelView.form src/wuerfelthreads/view/WuerfelView.java --- src/netz/{view2 => view}/ChatView.form | 0 src/netz/{view2 => view}/ChatView.java | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename src/netz/{view2 => view}/ChatView.form (100%) rename src/netz/{view2 => view}/ChatView.java (99%) diff --git a/src/netz/view2/ChatView.form b/src/netz/view/ChatView.form similarity index 100% rename from src/netz/view2/ChatView.form rename to src/netz/view/ChatView.form diff --git a/src/netz/view2/ChatView.java b/src/netz/view/ChatView.java similarity index 99% rename from src/netz/view2/ChatView.java rename to src/netz/view/ChatView.java index a179139..c8f9ac9 100644 --- a/src/netz/view2/ChatView.java +++ b/src/netz/view/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.*;