resolved conflict

This commit is contained in:
thatsIch 2014-09-28 12:11:18 +02:00
commit 207758f895

View file

@ -389,7 +389,6 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, IFluidHan
return null;
return super.extractItems(request, mode, src);
}
}
private <StackType extends IAEStack> MEMonitorHandler<StackType> wrap(IMEInventoryHandler h)