fixed collision

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;