diff --git a/scripts/mergeAll.sh b/scripts/mergeAll.sh index 012bf34d3..13f36fbfb 100755 --- a/scripts/mergeAll.sh +++ b/scripts/mergeAll.sh @@ -13,9 +13,6 @@ git checkout beta-ics git merge beta git merge ice-cream-sandwich -git checkout external-formats -git merge master - git checkout booksdb git merge master