Merge upstream/master into ljacqu/enums

2015-11-23 23:31:26 +01:00
parent 6422f90114 09067ddbd1
commit 16a69d4126
137 changed files with 4848 additions and 4477 deletions
@@ -62,8 +62,8 @@ public final class ConsoleLogger {
        }
        try {
            Files.write(Settings.LOG_FILE.toPath(), (dateTime + ": " + message + StringUtils.newline).getBytes(),
-                    StandardOpenOption.APPEND,
-                    StandardOpenOption.CREATE);
+                StandardOpenOption.APPEND,
+                StandardOpenOption.CREATE);
        } catch (IOException ignored) {
        }
    }