Fixes microsoft#2058 & microsoft#2079

NikCharlebois · Jul 12, 2022 · f90208f · f90208f
1 parent 83fbac8
commit f90208f
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,14 +2,11 @@
 
 # UNRELEASED
 
-<<<<<<< Updated upstream
-=======
 * AADConditionalAccessPolicy
   * Fixed issue for Included and Excluded properties where the last instance couldn't be removed.
     FIXES [#2058](https://github.com/microsoft/Microsoft365DSC/issues/2058) & [#2079](https://github.com/microsoft/Microsoft365DSC/issues/2079)
 * AADAuthorizationPolicy
   * Initial release.
->>>>>>> Stashed changes
 * EXOATPPolicyForO365
   * Deprecated properties AllowClickThrough, EnableSafeLinksForO365Clients & TrackClicks.
 * EXOAuthenticationPolicyAssignment