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

Fix conflicts

Browse Source
This commit is contained in:
Gabriele C
2015-10-20 22:05:19 +02:00
parent 704b6966f3 e1c1d18d05
commit 38832fc2ce
5 changed files with 30 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/fr/xephi/authme/settings/Settings.java
+2 -2
View File
@@ -280,7 +280,7 @@ public final class Settings extends YamlConfiguration {
forceRegisterCommands = configFile.getStringList("settings.forceRegisterCommands");
forceRegisterCommandsAsConsole = configFile.getStringList("settings.forceRegisterCommandsAsConsole");
customAttributes = configFile.getBoolean("Hooks.customAttributes");
generateImage = configFile.getBoolean("Email.generateImage", true);
generateImage = configFile.getBoolean("Email.generateImage", false);
isMySQLWebsite = configFile.getBoolean("DataSource.mySQLWebsite", false);
// Load the welcome message
@@ -476,7 +476,7 @@ public final class Settings extends YamlConfiguration {
changes = true;
}
if (!contains("Email.generateImage")) {
set("Email.generateImage", true);
set("Email.generateImage", false);
changes = true;
}
if (!contains("DataSource.mySQLRealName")) {