Fix merge imports
This commit is contained in:
parent
206dd56d14
commit
4fb4c2c865
|
@ -41,10 +41,7 @@ import org.bukkit.entity.Entity;
|
|||
import org.bukkit.entity.Item;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
import org.bukkit.event.EventPriority;
|
||||
>>>>>>> refs/remotes/origin/develop
|
||||
import org.bukkit.event.entity.PlayerDeathEvent;
|
||||
import org.bukkit.event.inventory.InventoryClickEvent;
|
||||
import org.bukkit.event.player.PlayerInteractEvent;
|
||||
|
|
Loading…
Reference in New Issue