The merge went well!!

Tags: #story[1109]
This commit is contained in:
Michael Rausch
2017-08-16 14:51:44 +12:00
parent 8fb5ea2223
commit 5843fc9212
4 changed files with 35 additions and 21 deletions
@@ -73,11 +73,6 @@ public class ServerToClientThread implements Runnable, Observer {
private XMLGenerator xml;
private static final int PRESTART_TIME = 60 * -1000;
private static final int WARNING_TIME = 30 * -1000;
private static final int PREPATORY_TIME = 10 * -1000;
private List<ConnectionListener> connectionListeners = new ArrayList<>();
private ServerYacht yacht;