fix cherry-pick

BobZhome · Jan 31, 2013 · dae6252 · dae6252
1 parent 71b681f
commit dae6252
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/vendorsetup.sh b/vendorsetup.sh
@@ -1,8 +0,0 @@
-<<<<<<< HEAD
-for combo in $(cat vendor/cm/jenkins-build-targets)
-=======
-for combo in $(wget -o /dev/null -O - https://raw.github.com/CyanogenMod/hudson/master/cm-build-targets | grep cm-10.1 | awk {'print $1'})
->>>>>>> 13e5cb0... Update path for build roster
-do
-    add_lunch_combo $combo
-done