diff --git a/scripts/mergeAll.sh b/scripts/mergeAll.sh index a76c38e90..815980aad 100755 --- a/scripts/mergeAll.sh +++ b/scripts/mergeAll.sh @@ -16,9 +16,6 @@ git merge ice-cream-sandwich git checkout yota2 git merge ice-cream-sandwich -git checkout yota -git merge yota2 - git checkout kindle git merge yota2