Cleaned up error in md file

pnp · Apr 7, 2022 · 98410fc · 98410fc
1 parent e816dc1
commit 98410fc
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/documentation/Sync-PnPSharePointUserProfilesFromAzureActiveDirectory.md b/documentation/Sync-PnPSharePointUserProfilesFromAzureActiveDirectory.md
@@ -131,15 +131,7 @@ Accept wildcard characters: False
 ```
 
 ### -IdType
-<<<<<<< HEAD
-<<<<<<< HEAD
 The type of profile identifier (Email/CloudId/PrincipalName). Defaults to CloudId. Ensure that if you use this in combination with `-Users` that all of the user objects you're passing in are having their Mail property populated when choosing IdType Email, Id property for IdType CloudId or UserPrincipalName for IdType PrincipalName.
-=======
-The type of profile identifier (Email/CloudId/PrincipalName). Defaults to CloudId. Ensure that if you use this in combination with `-Users` that all of the user objects you're passing in are having their Mail property populated when choosing IdType Email, Id property for CloudId or UserPrincipalName for PrincipalName.
->>>>>>> b75bab61... Work in progress
-=======
-The type of profile identifier (Email/CloudId/PrincipalName). Defaults to CloudId. Ensure that if you use this in combination with `-Users` that all of the user objects you're passing in are having their Mail property populated when choosing IdType Email, Id property for IdType CloudId or UserPrincipalName for IdType PrincipalName.
->>>>>>> 813e9972... Minor documentatipn updates
 
 ```yaml
 Type: ImportProfilePropertiesUserIdType