From 71790e521495c8df87714cba48bed2460ea266e4 Mon Sep 17 00:00:00 2001
From: Dream-Master <dream-master@gmx.net>
Date: Sun, 22 May 2016 01:28:37 +0200
Subject: fix

---
 .../machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java        | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'src/main/java/gregtech/common/tileentities')

diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java
index e3351cebfe..3a30fda598 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java
@@ -220,12 +220,10 @@ public class GT_MetaTileEntity_ElectricBlastFurnace
         return false;
     }
 
-<<<<<<< HEAD
 
     @Override
     public String[] getInfoData() {
         return new String[]{"Heating Capacity: " + (this.mHeatingCapacity) + "K", "Progress:", (mProgresstime / 20) + " secs", (mMaxProgresstime / 20) + " secs", "Efficiency: " + (mEfficiency / 100.0F) + "%", "Problems: " + (getIdealStatus() - getRepairStatus())};
     }
-=======
->>>>>>> Scan-termals-of-EBF
+
 }
-- 
cgit