fixed merge error

Author: Matt-Westphal

ChangeLog.txt

@@ -1,13 +1,17 @@
-2015.06.25 version 0.9.4 
-* Added Batch cmdlets 
-    * Start-AzureBatchPoolResize 
-    * Stop-AzureBatchPoolResize 
-* RedisCache cmdlets  
-    * Set-AzureRedisCache - Added support for scaling, using RedisConfiguration instead of MaxMemoryPolicy #513 
-    * New-AzureRedisCache - Using RedisConfiguration instead of MaxMemoryPolicy #513 
-* Azure Key Vault cmdlets 
-    * Updated Key Vault package versions 
-    * Fixed bugs related to secrets 
+2015.06.25 version 0.9.4
+* Added Batch cmdlets
+    * Start-AzureBatchPoolResize
+    * Stop-AzureBatchPoolResize
+* RedisCache cmdlets 
+    * Set-AzureRedisCache - Added support for scaling, using RedisConfiguration instead of MaxMemoryPolicy #513
+    * New-AzureRedisCache - Using RedisConfiguration instead of MaxMemoryPolicy #513
+* Azure Key Vault cmdlets
+    * Updated Key Vault package versions
+    * Fixed bugs related to secrets
+* Azure Resource Manager
+    * Added Test-AzureResourceGroup and Test-AzureResource cmdlets
+    * Refactored Resource Lock cmdlets
+    * Removed unnecessary code when getting a resource
 * Added UsageAggregates cmdlets 
     * Get-UsageAggregates