From 26173cf35c4c4b7765700c21039982fddbd8b9e7 Mon Sep 17 00:00:00 2001
From: SirSengir <me@sengir.net>
Date: Wed, 14 Nov 2012 16:48:59 +0100
Subject: [PATCH] Fixed accidental edit conflict.

---
 common/buildcraft/energy/TileEngine.java | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/common/buildcraft/energy/TileEngine.java b/common/buildcraft/energy/TileEngine.java
index 48c8b18c..d5047ae8 100644
--- a/common/buildcraft/energy/TileEngine.java
+++ b/common/buildcraft/energy/TileEngine.java
@@ -478,9 +478,4 @@ public class TileEngine extends TileBuildCraft implements IPowerReceptor, IInven
 	}
 	@Override public ILiquidTank getTank(ForgeDirection direction, LiquidStack type) { return null; }
 
-	@Override
-	public ILiquidTank getTank(ForgeDirection direction, LiquidStack type) {
-		// TODO Auto-generated method stub
-		return null;
-	}
 }