diff --git a/merge.sh b/merge.sh deleted file mode 100755 index c3f8d848dd..0000000000 --- a/merge.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -set -e - -git checkout ardour -git pull --rebase - - -git checkout master -git pull --rebase -git merge ardour -git push