Fixing merge conflicts

2026-02-19 02:12:58 +01:00 · 2019-04-03 17:25:18 -07:00
parent 7bbf1acd5d b68feb6992
commit 8991c2bf2c
15 changed files with 710 additions and 642 deletions
--- a/src/main/java/com/gmail/nossr50/config/Config.java
+++ b/src/main/java/com/gmail/nossr50/config/Config.java
@@ -424,7 +424,6 @@ public abstract class Config implements VersionedConfig, Unload {
    {
        return userRootNode.getNode(path).getInt();
    }
-
    /**
     * Grabs a double from the specified node
     * @param path