Permalink
Browse files

FL-780: sync experimental to master for now

  • Loading branch information...
1 parent e2c4ece commit e383681fd2a5882290ae352e7622c294dce5cc15 @danielrobbins danielrobbins committed Sep 26, 2013
Showing with 1 addition and 1 deletion.
  1. +1 −1 funtoo/scripts/experimental-update.sh
@@ -3,4 +3,4 @@ eval `keychain --noask --eval id_dsa` || exit 1
cd /root/git/funtoo-overlay
# get latest merge.py and friends
git pull || exit 1
-/root/git/funtoo-overlay/funtoo/scripts/merge.py --branch experimental /var/git/experimental-mini-2011 || exit 1
+/root/git/funtoo-overlay/funtoo/scripts/merge.py --branch master /var/git/experimental-mini-2011 || exit 1

0 comments on commit e383681

Please sign in to comment.