From 2241a54955abf1eaf026df47c5c0260741ec2205 Mon Sep 17 00:00:00 2001
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
Date: Mon, 21 Mar 2016 12:32:05 -0500
Subject: [PATCH] Update upstream Spigot and upstreamMerge script Also remove
 paperclip from upstream merge, it shouldn't need merging very often

---
 Spigot           | 2 +-
 upstreamMerge.sh | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Spigot b/Spigot
index 04266858e3..f04e043eb1 160000
--- a/Spigot
+++ b/Spigot
@@ -1 +1 @@
-Subproject commit 04266858e3436dafcb20eba5ae3c9f6d63a7c5a9
+Subproject commit f04e043eb1aa5cb0c8450cd57d88fdb051cf99fd
diff --git a/upstreamMerge.sh b/upstreamMerge.sh
index d5e2868727..c3d5db20ad 100755
--- a/upstreamMerge.sh
+++ b/upstreamMerge.sh
@@ -12,5 +12,4 @@ function update {
 
 update Bukkit
 update CraftBukkit
-update Paperclip
-
+update Spigot