FIXES microsoft#3407

NikCharlebois · Jun 26, 2023 · 9ee61e8 · 9ee61e8
1 parent 0d84f58
commit 9ee61e8
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,15 +2,13 @@
 
 # UNRELEASED
 
-<<<<<<< Updated upstream
-=======
 * EXOAvailabilityConfig
   * Fixes an error where an error was thrown when the OrgWideAccount wasn't set.
     FIXES [#3402](https://github.com/microsoft/Microsoft365DSC/issues/3402)
 * IntuneDeviceEnrollmentPlatformRestriction
   * Fixes an error where the WindowsMobileRestriction property was still being assessed dispite it being deprecated.
     FIXES [#3407](https://github.com/microsoft/Microsoft365DSC/issues/3407)
->>>>>>> Stashed changes
+
 * DEPENDENCIES
   * Updated ReverseDSC to version 2.0.0.16.