Rx3/Factions
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Subversion seems to handle merges better than Git, but that's not saying much :-P

Browse Source 
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:
Brettflan 2011-04-04 06:47:18 -05:00
parent 2ec8437c35
commit 5fa0103c9e
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/bukkit/mcteam/factions/listeners/FactionsBlockListener.java
View File

@ -8,6 +8,7 @@ import org.bukkit.event.block.BlockListener;
import org.bukkit.event.block.BlockPlaceEvent; import org.bukkit.event.block.BlockPlaceEvent;
import com.bukkit.mcteam.factions.Board; import com.bukkit.mcteam.factions.Board;
import com.bukkit.mcteam.factions.Conf;
import com.bukkit.mcteam.factions.FLocation; import com.bukkit.mcteam.factions.FLocation;
import com.bukkit.mcteam.factions.FPlayer; import com.bukkit.mcteam.factions.FPlayer;
import com.bukkit.mcteam.factions.Faction; import com.bukkit.mcteam.factions.Faction;