Update upstream Spigot and upstreamMerge script

Also remove paperclip from upstream merge, it shouldn't need merging very often
2016-03-21 12:32:05 -05:00
parent 291d1f7d21
commit 2241a54955
2 changed files with 2 additions and 3 deletions
@@ -12,5 +12,4 @@ function update {

 update Bukkit
 update CraftBukkit
-update Paperclip
-
+update Spigot