Meishin/LoginSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix conflict

Browse Source 
Conflicts:
	src/main/java/fr/xephi/authme/AuthMe.java
This commit is contained in:
Gabriele C
2015-11-01 23:37:12 +01:00
parent 175da3f6fc 3fc2bcde6d
commit e60a5190f9
24 changed files with 32 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/fr/xephi/authme/command/executable/authme/UnregisterCommand.java
+1 -1
View File
@@ -11,7 +11,7 @@ import org.bukkit.scheduler.BukkitTask;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.ConsoleLogger;
import fr.xephi.authme.Utils;
import fr.xephi.authme.util.Utils;
import fr.xephi.authme.cache.auth.PlayerCache;
import fr.xephi.authme.cache.limbo.LimboCache;
import fr.xephi.authme.command.CommandParts;