diff --git a/scripts/mergeAll.sh b/scripts/mergeAll.sh index bac8f4f58..f6354458b 100755 --- a/scripts/mergeAll.sh +++ b/scripts/mergeAll.sh @@ -10,15 +10,15 @@ git checkout beta git merge master git checkout beta-ics -git merge beta git merge ice-cream-sandwich +git merge beta git checkout booksdb git merge master git checkout booksdb-ics -git merge booksdb git merge ice-cream-sandwich +git merge booksdb git checkout library-service-ics git merge booksdb-ics @@ -27,8 +27,8 @@ git checkout epub-native git merge master git checkout epub-native-ics -git merge epub-native git merge ice-cream-sandwich +git merge epub-native git checkout multidirs git merge master