Merge pull request #4 from xoap-io/dev

fix: removed merge conflict comments
xoap-io · Oct 23, 2023 · 579166e · 579166e
2 parents 9cdb8da + 45f85e0
commit 579166e
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/Readme.md b/Readme.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # XOAPRemoteDesktopServicesDSC
 
 This repository contains a PowerShell DSC module for the deployment of a complete Remote Desktop Services environment.
@@ -13,7 +12,6 @@ Please check out common DSC Community [contributing guidelines](https://dsccommu
 
 ## Change log
 
-<<<<<<< HEAD
 A full list of changes in each version can be found in the [Releases](https://github.com/xoap-io/XOAPRemoteDesktopServicesDSC/releases).
 
 ## Documentation