Bug 1158932: Clobbering branch //depot/bora/vsphere-2015/... from //depot/bora/prod-2015/...@2511606
This commit is contained in:
		| @@ -48,7 +48,8 @@ except: | |||||||
|  |  | ||||||
| (F_LINK, | (F_LINK, | ||||||
|  F_LINKABLE, |  F_LINKABLE, | ||||||
|  F_OPTIONAL) = [ 1<<x for x in range(3) ] |  F_OPTIONAL, | ||||||
|  |  F_SECRET) = [ 1<<x for x in range(4) ] | ||||||
|  |  | ||||||
| BASE_VERSION = 'vmodl.version.version0' | BASE_VERSION = 'vmodl.version.version0' | ||||||
| VERSION1     = 'vmodl.version.version1' | VERSION1     = 'vmodl.version.version1' | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Tianhao He
					Tianhao He