Merge conflicts

2025-12-10 11:18:45 +01:00 · 2019-04-04 00:24:34 -07:00
parent 5b2720a04f b8b0be71b1
commit 6cad982969
7 changed files with 21 additions and 8 deletions
--- a/src/main/java/com/gmail/nossr50/config/Config.java
+++ b/src/main/java/com/gmail/nossr50/config/Config.java
@@ -210,8 +210,6 @@ public abstract class Config implements VersionedConfig, Unload {
        return getDefaultConfigFile();
    }

-
-
    /**
     * Attemps to load the config file if it exists, if it doesn't it copies a new one from within the JAR
     * @return user config File