Merge master into '450-new-settings-rewrite'

Conflicts: - PerformBackup.java - Settings.java
2016-01-31 21:31:42 +01:00
parent 42ae30ed3a b299e4be91
commit 155881ef05
14 changed files with 48 additions and 209 deletions
@@ -19,7 +19,6 @@ import java.io.FileWriter;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Iterator;
 import java.util.List;
 import java.util.regex.Pattern;

@@ -31,9 +31,4 @@ final class PropertyMapComparator implements Comparator<Property> {
        return Node.compare(parent, p1.getPath(), p2.getPath());
    }

-    @Override
-    public boolean equals(Object obj) {
-        return this == obj;
-    }
-
 }