From eb1a54c78a399da8da382cea3b1f54bc2cfb53ba Mon Sep 17 00:00:00 2001 From: Nikolay Pultsin Date: Wed, 28 Mar 2012 19:06:27 +0100 Subject: [PATCH] external-formats in merged into beta and has gone --- scripts/mergeAll.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/scripts/mergeAll.sh b/scripts/mergeAll.sh index 012bf34d3..13f36fbfb 100755 --- a/scripts/mergeAll.sh +++ b/scripts/mergeAll.sh @@ -13,9 +13,6 @@ git checkout beta-ics git merge beta git merge ice-cream-sandwich -git checkout external-formats -git merge master - git checkout booksdb git merge master