Projects >> HyperConomy >>e6f0772b36219294dcd1a2e162c55b2680ec8e1f

Chunk
Conflicting content 
package regalowl.hyperconomy;

<<<<<<< HEAD
import java.util.HashMap;
import java.util.logging.Logger;
=======
import net.milkbowl.vault.economy.Economy;
>>>>>>> 18cf4074cc24dd9d70c8287571f96a87dbab80ee
import org.bukkit.Bukkit;
import org.bukkit.Effect;
import org.bukkit.World;
Solution content 
package regalowl.hyperconomy;


import net.milkbowl.vault.economy.Economy;
import org.bukkit.Bukkit;
import org.bukkit.Effect;
import org.bukkit.World;
File
Transaction.java
Developer's decision
Version 2
Kind of conflict
Import