summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2012-03-23 13:53:08 +0000
committerKHobbits <rob@khobbits.co.uk>2012-03-23 13:53:08 +0000
commitd0b94938e03e00cac7024de6d9927b693fde39a2 (patch)
tree6e5113839bab8a6cbefe744904fedbb3c6dcef86
parenta4d7b5dcf871e0ccfe34a7dbc2a5bf313d81f406 (diff)
parenta0cba8e63d95b62dfc34db77927f715aac162c1c (diff)
downloadEssentials-d0b94938e03e00cac7024de6d9927b693fde39a2.tar
Essentials-d0b94938e03e00cac7024de6d9927b693fde39a2.tar.gz
Essentials-d0b94938e03e00cac7024de6d9927b693fde39a2.tar.lz
Essentials-d0b94938e03e00cac7024de6d9927b693fde39a2.tar.xz
Essentials-d0b94938e03e00cac7024de6d9927b693fde39a2.zip
Merge branch 'master' of github.com:essentials/Essentials
-rw-r--r--Essentials/src/com/earth2me/essentials/EssentialsConf.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/Essentials/src/com/earth2me/essentials/EssentialsConf.java b/Essentials/src/com/earth2me/essentials/EssentialsConf.java
index 89fb53d34..85c2bbd8c 100644
--- a/Essentials/src/com/earth2me/essentials/EssentialsConf.java
+++ b/Essentials/src/com/earth2me/essentials/EssentialsConf.java
@@ -126,7 +126,7 @@ public class EssentialsConf extends YamlConfiguration
{
buffer.rewind();
data.clear();
- LOGGER.log(Level.INFO, "File " + configFile.getAbsolutePath().toString() + "is not utf-8 encoded, trying " + Charset.defaultCharset().displayName());
+ LOGGER.log(Level.INFO, "File " + configFile.getAbsolutePath().toString() + " is not utf-8 encoded, trying " + Charset.defaultCharset().displayName());
decoder = Charset.defaultCharset().newDecoder();
result = decoder.decode(buffer, data, true);
if (result.isError())