From d08207936b0ef4569ad26e44d29d2c8ef3b955be Mon Sep 17 00:00:00 2001
From: Ziggy <danish_cyborg@hotmail.com>
Date: Sat, 9 May 2015 02:37:37 +0200
Subject: [PATCH] Merge conflict, take 2

---
 src/services/galaxy/ConnectionService.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/services/galaxy/ConnectionService.java b/src/services/galaxy/ConnectionService.java
index 34e75e9c0..cb8461656 100644
--- a/src/services/galaxy/ConnectionService.java
+++ b/src/services/galaxy/ConnectionService.java
@@ -170,7 +170,6 @@ public class ConnectionService extends Service {
 		
 		if (p.getPlayerState() != PlayerState.LOGGED_OUT)
 			System.out.println("[" + p.getUsername() +"] Logged out " + p.getCharacterName());
-
 		p.setPlayerState(PlayerState.LOGGED_OUT);
 		disappearPlayers.add(p);
 		updateService.schedule(disappearRunnable, (long) DISAPPEAR_THRESHOLD, TimeUnit.MILLISECONDS);