Resolve merge conflicts in ChangeLog.md

With Azure Automation

Author: solankisamir

ChangeLog.md

@@ -55,6 +55,11 @@
     - New-AzureRmApiManagementOpenIdConnectProvider
     - Remove-AzureRmApiManagementOpenIdConnectProvider
     - Set-AzureRmApiManagementOpenIdConnectProvider
+* Azure Automation
+  * (New/Import)-AzureRmAutomationRunbook now supports the new values of 'GraphicalPowerShell' and 'GraphicalPowerShellWorkflow' with the Type parameter.  The use of 'Graph' value is discouraged.
+  * Start-AzureRmAutomationRunbook now supports the Wait and MaxWaitSeconds parameters.
+  * (New/Get)-AzureRmAutomationSchedule now supports weekly and monthly schedules.
+  * New-AzureRmAutomationSchedule now takes a TimeZone parameter to adjust for daylight savings.
 
 ##2016.05.04 version 1.4.0
 * Azure Resource Manager