From ba7ef4228c3297fe6a8d7aefd0376041051e3fc3 Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Mon, 13 Jun 2016 21:54:53 +0200 Subject: [PATCH] Update PluginBiomesOPlenty.java --- src/main/java/forestry/plugins/compat/PluginBiomesOPlenty.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/main/java/forestry/plugins/compat/PluginBiomesOPlenty.java b/src/main/java/forestry/plugins/compat/PluginBiomesOPlenty.java index c668b150a..5481da891 100644 --- a/src/main/java/forestry/plugins/compat/PluginBiomesOPlenty.java +++ b/src/main/java/forestry/plugins/compat/PluginBiomesOPlenty.java @@ -16,10 +16,7 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -<<<<<<< HEAD -======= ->>>>>>> 6ddc9f307918a66671aa307635bfce8f15b546d3 import net.minecraftforge.fml.common.event.FMLInterModComms; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.OreDictionary;