Update from upstream SpigotMC

eb39b4729ce
59b08be5833
a723278f74a
This commit is contained in:
Zach Brown
2015-01-04 20:01:24 -06:00
parent b7fb738d91
commit 1e81634a9d
6 changed files with 6 additions and 19 deletions

View File

@@ -655,7 +655,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java