From b28987edd2fbefb6b17a2674c3553ef17d7c8ed9 Mon Sep 17 00:00:00 2001 From: Nikolay Pultsin Date: Tue, 1 Jul 2014 21:45:42 +0100 Subject: [PATCH] obsolete branch --- scripts/mergeAll.sh | 3 --- 1 file changed, 3 deletions(-) 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