Merge branch 'master' of https://github.com/perseusCode/azure-powershell

unknown · unknown · commit af3f5e586006 · 2015-01-14T18:26:43.000-08:00
Conflicts:
	src/ResourceManager/Resources/Commands.Resources/ActiveDirectory/NewAzureADApplicationCommand.cs
diff --git a/src/ResourceManager/Resources/Commands.Resources/ActiveDirectory/NewAzureADApplicationCommand.cs b/src/ResourceManager/Resources/Commands.Resources/ActiveDirectory/NewAzureADApplicationCommand.cs
@@ -111,7 +111,7 @@ public NewAzureADApplicationCommand()
             KeyType = "AsymmetricX509Cert";
             KeyUsage = "Verify";
         }
-        
+
         public override void ExecuteCmdlet()
         {
             CreatePSApplicationParameters createParameters = new CreatePSApplicationParameters

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ public NewAzureADApplicationCommand()`
`111`	`111`	`KeyType = "AsymmetricX509Cert";`
`112`	`112`	`KeyUsage = "Verify";`
`113`	`113`	`}`
`114`		`-`
	`114`	`+`
`115`	`115`	`public override void ExecuteCmdlet()`
`116`	`116`	`{`
`117`	`117`	`CreatePSApplicationParameters createParameters = new CreatePSApplicationParameters`