Resolved Merge Conflicts Again

...
2014-01-19 01:51:21 -04:00
parent 15cfe6fc33
commit 37a10e5795
2 changed files with 1 additions and 2 deletions
--- a/src/main/java/StevenDimDoors/mod_pocketDim/world/gateways/GatewayBlockFilter.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/world/gateways/GatewayBlockFilter.java
@@ -15,7 +15,6 @@ public class GatewayBlockFilter extends SchematicFilter {
 	private Schematic schematic;
 	private Point3D entranceDoorLocation;

-
 	public GatewayBlockFilter(short dimensionalDoorID, short transientDoorID, short warpDoorID)
 	{
 		super("GatewayEntranceFinder");