Upstream
/
Vault
mirror of https://github.com/MilkBowl/Vault.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed another conflict

This commit is contained in:
mung3r 2011-10-10 00:30:45 -07:00
parent 4a40e50891
commit 50f916e3ae
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/net/milkbowl/vault/Vault.java
View File

@ -101,11 +101,7 @@ public class Vault extends JavaPlugin {
log.info(String.format("[%s][Economy] BOSEconomy6 not found.", getDescription().getName()));
}
// Try to load BOSEconomy
<<<<<<< HEAD
if (packageExists(new String[] { "cosine.boseconomy.BOSEconomy", "cosine.boseconomy.CommandHandler" })) {
=======
if (packageExists(new String[] { "cosine.boseconomy.BOSEconomy" })) {
>>>>>>> upstream/master
Economy bose7 = new Economy_BOSE7(this);
getServer().getServicesManager().register(net.milkbowl.vault.economy.Economy.class, bose7, this, ServicePriority.Normal);
log.info(String.format("[%s][Economy] BOSEconomy7 found: %s", getDescription().getName(), bose7.isEnabled() ? "Loaded" : "Waiting"));