Merge master into 306-commands-service - Conflicts

2015-12-26 21:33:53 +01:00
parent 103ebb44f0
commit 2bb386c488
3 changed files with 10 additions and 42 deletions
@@ -1,10 +1,5 @@
 package fr.xephi.authme.command.executable.converter;

-import java.util.List;
-
-import org.bukkit.Bukkit;
-import org.bukkit.command.CommandSender;
-
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.command.CommandService;
 import fr.xephi.authme.command.ExecutableCommand;