From fe479bd5da08ccb58127a0899ecd92eab3de218f Mon Sep 17 00:00:00 2001
From: Ziggeh <danish_cyborg@hotmail.com>
Date: Fri, 22 May 2015 06:02:58 +0200
Subject: [PATCH] conflict fix, take 2

---
 src/resources/objects/SWGObject.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/resources/objects/SWGObject.java b/src/resources/objects/SWGObject.java
index 374db75c2..314e05299 100644
--- a/src/resources/objects/SWGObject.java
+++ b/src/resources/objects/SWGObject.java
@@ -118,7 +118,6 @@ public class SWGObject implements Serializable, Comparable<SWGObject> {
 			child.containmentType = 4;
 		else
 			child.containmentType = containmentType;
-			
 		// TODO: Set containmentType based on if object is in a slot (4) or a container (-1)
 		sendObserversAndSelf(new UpdateContainmentMessage(child.objectId, objectId, containmentType));
 	}