commit 03b7ed804279b8aa959599aeeb2a4cf9a3dce00a
author Ben Henry <benhenry@google.com> Wed Nov 05 15:26:59 2014 -0800
committer Ben Henry <benhenry@google.com> Wed Nov 05 15:26:59 2014 -0800
tree 0fc47c2d7f2c05f5313572fd4ebdef9ed4595c0b
parent d0e602813a4d287ceeca7e3429225c7a6acf9fdd

chromeos_version.sh: Changing version on trunk back to 40.

A release branch was created before it was ready.  We need to
remove the branch and then reset the versioning to build from
Chrome 40 instead of 41 on trunk.

BUG=None
TEST=None

Change-Id: I970b7b15507be6627f76f0202feb0b955cef52b3

chromeos/config/chromeos_version.sh

diff --git a/chromeos/config/chromeos_version.sh b/chromeos/config/chromeos_version.sh
index 90d8a9c..233185a 100755
--- a/chromeos/config/chromeos_version.sh
+++ b/chromeos/config/chromeos_version.sh
@@ -45,7 +45,7 @@
 fi
 
 # Major version for Chrome.
-export CHROME_BRANCH=41
+export CHROME_BRANCH=40
 # Set CHROME values (Used for releases) to pass to chromeos-chrome-bin ebuild
 # URL to chrome archive
 export CHROME_BASE=