diff --git a/scripts/mergeAll.sh b/scripts/mergeAll.sh index c1f6bbc64..b311f6775 100755 --- a/scripts/mergeAll.sh +++ b/scripts/mergeAll.sh @@ -10,13 +10,6 @@ git checkout beta-ics git merge beta git merge ice-cream-sandwich -git checkout plugins -git merge master - -git checkout plugins-ics -git merge plugins -git merge ice-cream-sandwich - git checkout yota2 git merge ice-cream-sandwich