From d7cfd8cf29ba3936eaf0183f5d6f94bd99c8976d Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net>
Date: Sun, 15 Jan 2017 10:05:31 -0700
Subject: [PATCH] Fix patch conflicts

---
 mergeUpstream.sh | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100755 mergeUpstream.sh

diff --git a/mergeUpstream.sh b/mergeUpstream.sh
new file mode 100755
index 0000000..8e75278
--- /dev/null
+++ b/mergeUpstream.sh
@@ -0,0 +1,15 @@
+
+PS1="$"
+basedir=`pwd`
+
+function update {
+    cd "$basedir/$1"
+    git fetch && git reset --hard origin/master
+    cd "$basedir/$1/.."
+    git add $1
+}
+
+update Waterfall
+
+# Update submodules
+git submodule update --recursive