From 94bbc2d658801c28d519a934abb5e3da53f9e815 Mon Sep 17 00:00:00 2001
From: StevenRS11 <stevenrs11@aol.com>
Date: Mon, 30 Sep 2013 00:57:27 -0400
Subject: [PATCH] fixed collision

---
 StevenDimDoors/mod_pocketDim/core/DimLink.java | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/StevenDimDoors/mod_pocketDim/core/DimLink.java b/StevenDimDoors/mod_pocketDim/core/DimLink.java
index c3800c3..3ca4e0b 100644
--- a/StevenDimDoors/mod_pocketDim/core/DimLink.java
+++ b/StevenDimDoors/mod_pocketDim/core/DimLink.java
@@ -15,16 +15,13 @@ public abstract class DimLink
 	
 	protected DimLink(Point4D source, DimLink parent, int orientation)
 	{
-<<<<<<< HEAD
-		this.orientation=orientation;
-=======
+
 		if (parent.source.getDimension() != source.getDimension())
 		{
 			// Ban having children in other dimensions to avoid serialization issues with cross-dimensional tails
 			throw new IllegalArgumentException("source and parent.source must have the same dimension.");
 		}
 		
->>>>>>> 25446453cba6f491cc0745803f448dd000d453cc
 		this.parent = parent;
 		this.source = source;
 		this.tail = parent.tail;