From 9db2d425c146c4927e091e7a3062722d5beb5eff Mon Sep 17 00:00:00 2001
From: BakeOrDie <chris.feichtenbeiner@t-online.de>
Date: Wed, 9 Dec 2020 11:55:54 +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                     | 2 +-
 src/netz/controller/BtnController.java  | 2 +-
 src/netz/controller/ChatController.java | 2 +-
 src/netz/{view => view2}/ChatView.form  | 0
 src/netz/{view => view2}/ChatView.java  | 4 +---
 5 files changed, 4 insertions(+), 6 deletions(-)
 rename src/netz/{view => view2}/ChatView.form (100%)
 rename src/netz/{view => view2}/ChatView.java (99%)

diff --git a/src/netz/Start.java b/src/netz/Start.java
index 6841e17..3bedda6 100755
--- a/src/netz/Start.java
+++ b/src/netz/Start.java
@@ -15,7 +15,7 @@ import javax.swing.WindowConstants;
 import netz.controller.BtnController;
 import netz.controller.ChatController;
 import netz.model.ChatModel;
-import netz.view.ChatView;
+import netz.view2.ChatView;
 
 /**
  * Builder Class
diff --git a/src/netz/controller/BtnController.java b/src/netz/controller/BtnController.java
index 1c04ecf..dfc8079 100644
--- a/src/netz/controller/BtnController.java
+++ b/src/netz/controller/BtnController.java
@@ -10,7 +10,7 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.logging.Logger;
 import netz.model.ChatModel;
-import netz.view.ChatView;
+import netz.view2.ChatView;
 import ohmlogger.OhmLogger;
 
 /**
diff --git a/src/netz/controller/ChatController.java b/src/netz/controller/ChatController.java
index 96ac7d3..ff6750d 100644
--- a/src/netz/controller/ChatController.java
+++ b/src/netz/controller/ChatController.java
@@ -10,7 +10,7 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.logging.Logger;
 import netz.model.ChatModel;
-import netz.view.ChatView;
+import netz.view2.ChatView;
 import ohmlogger.OhmLogger;
 
 /**
diff --git a/src/netz/view/ChatView.form b/src/netz/view2/ChatView.form
similarity index 100%
rename from src/netz/view/ChatView.form
rename to src/netz/view2/ChatView.form
diff --git a/src/netz/view/ChatView.java b/src/netz/view2/ChatView.java
similarity index 99%
rename from src/netz/view/ChatView.java
rename to src/netz/view2/ChatView.java
index c8f9ac9..4fe6486 100644
--- a/src/netz/view/ChatView.java
+++ b/src/netz/view2/ChatView.java
@@ -3,9 +3,7 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package netz.view;
-
-import netz.view.*;
+package netz.view2;
 
 /**
  *