diff --git a/scripts/mergeAll.sh b/scripts/mergeAll.sh index 7403bd4e0..506dfa5cb 100755 --- a/scripts/mergeAll.sh +++ b/scripts/mergeAll.sh @@ -6,11 +6,8 @@ git merge master git checkout ice-cream-sandwich git merge master -git checkout multidirs -git merge master - git checkout beta -git merge multidirs +git merge master git checkout beta-ics git merge beta