fix merge conflict

Outek · Outek · commit 5d6f5be3424c · 2018-06-13T22:55:32.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,8 +10,6 @@
 - Changed the scope from Global to Script in MSFT_ScheduledTask.Integration.Tests.ps1
 - Changed the scope from Global to Script ComputerManagementDsc.Common.Tests.ps1
 
-=======
-
 ## 5.1.0.0
 
 - TimeZone:
