fixed issues

shriramnat · web-flow · commit 7d0be9a6be14 · 2017-04-19T15:39:20.000-07:00
diff --git a/Infrastructure/Tests/Infra.Tests.ps1 b/Infrastructure/Tests/Infra.Tests.ps1
@@ -80,14 +80,8 @@ InModuleScope $script:ModuleName {
                 Should Not Throw
         }
         It 'Set-AzSLocationInformation should not throw' {
-
-<<<<<<< HEAD
             { Set-AzSLocationInformation -TenantID $AadTenant -EnvironmentName $EnvironmentName -AzureStackCredentials $stackLoginCreds -Region 'local' -Latitude '12.972442' -Longitude '77.580643'} |
-                Shrould Not Throw
-=======
-            { Set-AzSLocationInformation -TenantID $AadTenant -EnvironmentName $EnvironmentName -AzureStackCredentials $stackLoginCreds -Region 'local' -Latitude '12.972442' -Longitude '77.580643'}
                 Should Not Throw
->>>>>>> c5c074a1429717424e1a58e6618a366177309fb8
         }
 
 

Original file line number	Diff line number	Diff line change
`@@ -80,14 +80,8 @@ InModuleScope $script:ModuleName {`
`80`	`80`	`Should Not Throw`
`81`	`81`	`}`
`82`	`82`	`It 'Set-AzSLocationInformation should not throw' {`
`83`		`-`
`84`		`-<<<<<<< HEAD`
`85`	`83`	`{ Set-AzSLocationInformation -TenantID $AadTenant -EnvironmentName $EnvironmentName -AzureStackCredentials $stackLoginCreds -Region 'local' -Latitude '12.972442' -Longitude '77.580643'} \|`
`86`		`- Shrould Not Throw`
`87`		`-=======`
`88`		`- { Set-AzSLocationInformation -TenantID $AadTenant -EnvironmentName $EnvironmentName -AzureStackCredentials $stackLoginCreds -Region 'local' -Latitude '12.972442' -Longitude '77.580643'}`
`89`	`84`	`Should Not Throw`
`90`		`->>>>>>> c5c074a1429717424e1a58e6618a366177309fb8`
`91`	`85`	`}`
`92`	`86`
`93`	`87`