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
This commit is contained in:
parent
2ec8437c35
commit
5fa0103c9e
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user