diff --git a/scripts/mergeAll.sh b/scripts/mergeAll.sh index a056a69c2..7403bd4e0 100755 --- a/scripts/mergeAll.sh +++ b/scripts/mergeAll.sh @@ -13,14 +13,14 @@ git checkout beta git merge multidirs git checkout beta-ics -git merge ice-cream-sandwich git merge beta +git merge ice-cream-sandwich git checkout library-service git merge master git checkout library-service-ics -git merge ice-cream-sandwich git merge library-service +git merge ice-cream-sandwich git checkout master