Skip to content

Commit 7670bf4

Browse files
committed
fix merge conflict
1 parent 5d6f5be commit 7670bf4

1 file changed

Lines changed: 0 additions & 3 deletions

File tree

CHANGELOG.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99
- Moved strings to localization file.
1010
- Changed the scope from Global to Script in MSFT_ScheduledTask.Integration.Tests.ps1
1111
- Changed the scope from Global to Script ComputerManagementDsc.Common.Tests.ps1
12-
13-
## 5.1.0.0
14-
1512
- TimeZone:
1613
- Migrated xTimeZone resource from [xTimeZone](https://github.com/PowerShell/xTimeZone)
1714
and renamed to TimeZone - fixes [Issue #157](https://github.com/PowerShell/ComputerManagementDsc/issues/157).

0 commit comments

Comments
 (0)