From 740e672a83c84e03cd02caeabbac7c1777eabee9 Mon Sep 17 00:00:00 2001 From: Nikolay Pultsin Date: Sun, 12 Jan 2014 20:03:16 +0000 Subject: [PATCH] plugins & plugins-ics branch have gone --- scripts/mergeAll.sh | 7 ------- 1 file changed, 7 deletions(-) diff --git a/scripts/mergeAll.sh b/scripts/mergeAll.sh index c1f6bbc64..b311f6775 100755 --- a/scripts/mergeAll.sh +++ b/scripts/mergeAll.sh @@ -10,13 +10,6 @@ git checkout beta-ics git merge beta git merge ice-cream-sandwich -git checkout plugins -git merge master - -git checkout plugins-ics -git merge plugins -git merge ice-cream-sandwich - git checkout yota2 git merge ice-cream-sandwich