Finish removing old gitmodules stuff that should've never lasted this

long
2014-11-29 23:59:27 -08:00 · 2014-11-29 23:59:27 -08:00 · af814004a5
parent 299b60f280
commit af814004a5
2 changed files with 2 additions and 14 deletions
--- a/.gitignore
+++ b/.gitignore
@ -40,3 +40,5 @@ Spigot-API
 Spigot-Server
 PaperSpigot-Server
 PaperSpigot-API
+Bukkit
+CraftBukkit
--- a/upstreamMerge.sh
+++ b/upstreamMerge.sh
@ -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