summaryrefslogtreecommitdiffstats
path: root/EssentialsXMPP
diff options
context:
space:
mode:
authorementalo <ementalodev@gmx.co.uk>2012-06-25 22:24:10 +0100
committerementalo <ementalodev@gmx.co.uk>2012-06-25 22:24:10 +0100
commitf8bb4d058d548f05e58bd28a11171b2a6618f312 (patch)
tree47393a0c9eb3e8802a25457c4aa7ea8e07f82f60 /EssentialsXMPP
parent283a9ce9fa66427e342e236edfdec81cbd0fc01f (diff)
downloadEssentials-f8bb4d058d548f05e58bd28a11171b2a6618f312.tar
Essentials-f8bb4d058d548f05e58bd28a11171b2a6618f312.tar.gz
Essentials-f8bb4d058d548f05e58bd28a11171b2a6618f312.tar.lz
Essentials-f8bb4d058d548f05e58bd28a11171b2a6618f312.tar.xz
Essentials-f8bb4d058d548f05e58bd28a11171b2a6618f312.zip
Merge fixes
Diffstat (limited to 'EssentialsXMPP')
-rw-r--r--EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java
index 2f66da1b4..5ea94eab9 100644
--- a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java
+++ b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java
@@ -3,7 +3,6 @@ package com.earth2me.essentials.xmpp;
import com.earth2me.essentials.api.IReload;
import com.earth2me.essentials.api.IUser;
import com.earth2me.essentials.utils.Util;
-import com.earth2me.essentials.Util;
import java.io.File;
import java.util.*;
import java.util.logging.Handler;