From af814004a5562d0f1b261b5f9505ee875dbb0d66 Mon Sep 17 00:00:00 2001
From: Zach Brown <Zbob750@live.com>
Date: Sat, 29 Nov 2014 23:59:27 -0800
Subject: [PATCH] Finish removing old gitmodules stuff that should've never
 lasted this long

---
 .gitignore       |  2 ++
 upstreamMerge.sh | 14 --------------
 2 files changed, 2 insertions(+), 14 deletions(-)
 delete mode 100755 upstreamMerge.sh

diff --git a/.gitignore b/.gitignore
index c101ffb15..952f89623 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,3 +40,5 @@ Spigot-API
 Spigot-Server
 PaperSpigot-Server
 PaperSpigot-API
+Bukkit
+CraftBukkit
diff --git a/upstreamMerge.sh b/upstreamMerge.sh
deleted file mode 100755
index c95e357a2..000000000
--- a/upstreamMerge.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-PS1="$"
-basedir=`pwd`
-
-function update {
-    cd "$basedir/$1"
-    git fetch && git reset --hard origin/master
-    cd ../
-    git add $1
-}
-
-update Bukkit
-update CraftBukkit