Merge branch 'kvga' of https://github.com/YuhuiZhong/azure-powershell-pr into kvga

Yuhui Zhong · Yuhui Zhong · commit b421b85ec3d4 · 2015-04-10T14:30:45.000-07:00
Conflicts:
	src/ResourceManager/KeyVault/Commands.KeyVault.Test/UnitTests/SetKeyVaultSecretAttributeTests.cs
	src/ResourceManager/KeyVault/Commands.KeyVault/Commands/SetAzureKeyVaultKeyAttribute.cs
	src/ResourceManager/KeyVault/Commands.KeyVault/Commands/SetAzureKeyVaultSecretAttribute.cs
	src/ResourceManager/KeyVault/Commands.KeyVault/Models/KeyVaultObjectFilterOptions.cs
	src/ResourceManager/KeyVault/Commands.KeyVault/Models/SecretAttributes.cs
	src/ResourceManager/KeyVault/Commands.KeyVault/Models/TagsHelper.cs
diff --git a/src/ResourceManager/KeyVault/Commands.KeyVault.Test/UnitTests/SetKeyVaultSecretAttributeTests.cs b/src/ResourceManager/KeyVault/Commands.KeyVault.Test/UnitTests/SetKeyVaultSecretAttributeTests.cs
@@ -1,7 +1,8 @@
-﻿// ----------------------------------------------------------------------------------
+// ----------------------------------------------------------------------------------
 //
 // Copyright Microsoft Corporation
 // Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/ResourceManager/KeyVault/Commands.KeyVault/Models/SecretAttributes.cs b/src/ResourceManager/KeyVault/Commands.KeyVault/Models/SecretAttributes.cs
@@ -1,4 +1,4 @@
-﻿// ----------------------------------------------------------------------------------
+// ----------------------------------------------------------------------------------
 //
 // Copyright Microsoft Corporation
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/ResourceManager/KeyVault/Commands.KeyVault/Models/TagsHelper.cs b/src/ResourceManager/KeyVault/Commands.KeyVault/Models/TagsHelper.cs
@@ -1,4 +1,4 @@
-﻿// ----------------------------------------------------------------------------------
+// ----------------------------------------------------------------------------------
 //
 // Copyright Microsoft Corporation
 // Licensed under the Apache License, Version 2.0 (the "License");

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// ----------------------------------------------------------------------------------`
	`1`	`+// ----------------------------------------------------------------------------------`
`2`	`2`	`//`
`3`	`3`	`// Copyright Microsoft Corporation`
`4`	`4`	`// Licensed under the Apache License, Version 2.0 (the "License");`