From 37a10e5795752973d8336b99a59d7fe67be9003e Mon Sep 17 00:00:00 2001
From: SenseiKiwi <senseikiwi@server.fake>
Date: Sun, 19 Jan 2014 01:51:21 -0400
Subject: [PATCH] Resolved Merge Conflicts Again

...
---
 .../mod_pocketDim/world/gateways/BaseGateway.java               | 2 +-
 .../mod_pocketDim/world/gateways/GatewayBlockFilter.java        | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/java/StevenDimDoors/mod_pocketDim/world/gateways/BaseGateway.java b/src/main/java/StevenDimDoors/mod_pocketDim/world/gateways/BaseGateway.java
index 9f58bc87..58f6da7c 100644
--- a/src/main/java/StevenDimDoors/mod_pocketDim/world/gateways/BaseGateway.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/world/gateways/BaseGateway.java
@@ -158,7 +158,7 @@ public abstract class BaseGateway
 	{
 		return !this.isBiomeSpecific || this.biomeNames.contains(biome.biomeName.toLowerCase());
 	}
-	
+
 	public boolean hasSchematic()
 	{
 		return this.schematicPaths != null && !this.schematicPaths.isEmpty();
diff --git a/src/main/java/StevenDimDoors/mod_pocketDim/world/gateways/GatewayBlockFilter.java b/src/main/java/StevenDimDoors/mod_pocketDim/world/gateways/GatewayBlockFilter.java
index 97e07e6c..ed66c611 100644
--- 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");