From 5fa0103c9e01451455af284c74dd94499d8814fd Mon Sep 17 00:00:00 2001 From: Brettflan Date: Mon, 4 Apr 2011 06:47:18 -0500 Subject: [PATCH] Subversion seems to handle merges better than Git, but that's not saying much :-P Committed change not exactly related, just a casualty of the should-have-been-a-simple-merge-and-not-conflicting craziness --- .../bukkit/mcteam/factions/listeners/FactionsBlockListener.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/com/bukkit/mcteam/factions/listeners/FactionsBlockListener.java b/src/com/bukkit/mcteam/factions/listeners/FactionsBlockListener.java index 2e8533cd..231a972f 100644 --- a/src/com/bukkit/mcteam/factions/listeners/FactionsBlockListener.java +++ b/src/com/bukkit/mcteam/factions/listeners/FactionsBlockListener.java @@ -8,6 +8,7 @@ import org.bukkit.event.block.BlockListener; import org.bukkit.event.block.BlockPlaceEvent; import com.bukkit.mcteam.factions.Board; +import com.bukkit.mcteam.factions.Conf; import com.bukkit.mcteam.factions.FLocation; import com.bukkit.mcteam.factions.FPlayer; import com.bukkit.mcteam.factions.Faction;