diff --git a/scripts/mergeAll.sh b/scripts/mergeAll.sh index 484b357fe..7499f4098 100755 --- a/scripts/mergeAll.sh +++ b/scripts/mergeAll.sh @@ -20,4 +20,7 @@ git merge ice-cream-sandwich git checkout yota git merge ice-cream-sandwich +git checkout yota2 +git merge ice-cream-sandwich + git checkout master