Correcting merge error

markcowl · markcowl · commit 3de5d1ea6a0a · 2015-09-23T19:47:57.000-07:00
diff --git a/src/ResourceManager/Profile/Commands.Profile/Subscription/GetAzureRMSubscription.cs b/src/ResourceManager/Profile/Commands.Profile/Subscription/GetAzureRMSubscription.cs
@@ -75,7 +75,7 @@ protected override void ProcessRecord()
                 {
                     if (!this._client.TryGetSubscriptionByName(tenant, this.SubscriptionName, out result))
                     {
-                        ThrowSubscriptionNotFoundError(this.Tenant, this.SubscriptionName);
+                        ThrowSubscriptionNotFoundError(this.TenantId, this.SubscriptionName);
                     }
 
                     WriteObject(result);

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ protected override void ProcessRecord()`
`75`	`75`	`{`
`76`	`76`	`if (!this._client.TryGetSubscriptionByName(tenant, this.SubscriptionName, out result))`
`77`	`77`	`{`
`78`		`- ThrowSubscriptionNotFoundError(this.Tenant, this.SubscriptionName);`
	`78`	`+ ThrowSubscriptionNotFoundError(this.TenantId, this.SubscriptionName);`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`WriteObject(result);`