Fixed merge conflicts

Author: PlagueHO

README.md

@@ -161,11 +161,13 @@ xVirtualMemory has the following properties:
 
 ### Unreleased
 
-* Updated resources
-  * BREAKING CHANGE: xScheduledTask: Added nearly all available parameters for tasks
 * Updated AppVeyor.yml to use AppVeyor.psm1 module in DSCResource.Tests.
 * Removed Markdown.md errors.
 * Added CodeCov.io support.
+
+### 2.0.0.0
+* Updated resources
+  * BREAKING CHANGE: xScheduledTask: Added nearly all available parameters for tasks
 * xVirtualMemory:
   * Fixed failing tests.
 

xComputerManagement.psd1

@@ -1,6 +1,6 @@
 @{
 # Version number of this module.
-ModuleVersion = '1.10.0.0'
+ModuleVersion = '2.0.0.0'
 
 # ID used to uniquely identify this module
 GUID = 'B5004952-489E-43EA-999C-F16A25355B89'
@@ -49,8 +49,8 @@ PrivateData = @{
         # IconUri = ''
 
         # ReleaseNotes of this module
-        ReleaseNotes = '* Added resources
-  - xVirtualMemory
+        ReleaseNotes = '* Updated resources
+  - BREAKING CHANGE: xScheduledTask: Added nearly all available parameters for tasks
 
 '
 
@@ -62,3 +62,4 @@ PrivateData = @{
 
 
 
+