From a8b7af1db92747d01d4a25c1697c00b07d80c355 Mon Sep 17 00:00:00 2001 From: Nikolay Pultsin Date: Mon, 21 Apr 2014 19:58:33 +0100 Subject: [PATCH] no more fc branches --- scripts/mergeAll.sh | 7 ------- 1 file changed, 7 deletions(-) diff --git a/scripts/mergeAll.sh b/scripts/mergeAll.sh index f4548690c..91bb99dc6 100755 --- a/scripts/mergeAll.sh +++ b/scripts/mergeAll.sh @@ -25,13 +25,6 @@ git merge master git checkout microtypography git merge ice-cream-sandwich -git checkout fc -git merge master - -git checkout fc-ics -git merge ice-cream-sandwich -git merge fc - git checkout yotabeta git merge beta-ics git merge yota2