Conflict markers removed

sreeparnas · sreeparnas · commit 3d6227529790 · 2025-07-17T12:22:03.000+01:00
diff --git a/docs/directorymanager/11.1/admincenter/applications/remoteiisprerequisites.md b/docs/directorymanager/11.1/admincenter/applications/remoteiisprerequisites.md
@@ -118,21 +118,10 @@ The next step is to assign permissions on the physical folder that binds to your
     ```
 
     :::tip
-<<<<<<< HEAD
-        :::tip
-                :::tip
-                                Remember, to provide values for alias "site name" and path "physical folder location of the
-                site", created in the section Create a Site in Remote IIS.
-                :::
-                :::
-                :::
-
-
-=======
-        Remember, to provide values for alias "site name" and path "physical folder location of the
+    Remember, to provide values for alias "site name" and path "physical folder location of the
     site", created in the section Create a Site in Remote IIS.
     :::
->>>>>>> origin/dev
+
 
 
 ## Generate an Access Key
diff --git a/docs/directorymanager/11.1/admincenter/authpolicy/setupauth/email.md b/docs/directorymanager/11.1/admincenter/authpolicy/setupauth/email.md
@@ -18,11 +18,6 @@ these languages.
 Before configuring Email authentication, make sure that an SMTP server is configured for the
 identity store. See the [Configure an SMTP Server](/docs/directorymanager/11.1/admincenter/identitystore/configure/smtpserver.md) topic.
 :::
-<<<<<<< HEAD
-
-=======
->>>>>>> origin/dev
-
 
 ## Enable Email Authentication for an Identity Store
 
diff --git a/docs/directorymanager/11.1/admincenter/authpolicy/setupauth/windowshello.md b/docs/directorymanager/11.1/admincenter/authpolicy/setupauth/windowshello.md
@@ -12,11 +12,6 @@ hardware installed, such as fingerprint reader and 3D camera.
 :::note
 Windows Hello supports the Microsoft Edge browser only.
 :::
-<<<<<<< HEAD
-
-=======
->>>>>>> origin/dev
-
 
 ## Enable Windows Hello on Windows 10
 
diff --git a/docs/directorymanager/11.1/admincenter/general/history.md b/docs/directorymanager/11.1/admincenter/general/history.md
@@ -61,11 +61,6 @@ Manager portal. Both actions are logged in Admin Center history. However, histor
 of IdentityStoreA will apply to the SMS gateway account creation action and that of IdentityStoreB
 will apply to the Directory Manager portal creation action.
 :::
-<<<<<<< HEAD
-
-=======
->>>>>>> origin/dev
-
 
 **Event Logging**
 
diff --git a/docs/directorymanager/11.1/admincenter/general/licensing.md b/docs/directorymanager/11.1/admincenter/general/licensing.md
@@ -69,11 +69,6 @@ Licenses for certain add-ons are dependent on other licenses, such as the Group
 license is dependent on the Group Usage Service license, which in turn is dependent on the Group
 Management license.
 :::
-<<<<<<< HEAD
-
-=======
->>>>>>> origin/dev
-
 
 **What happens when your license expires**
 
diff --git a/docs/directorymanager/11.1/admincenter/securityrole/policy/helpdesk.md b/docs/directorymanager/11.1/admincenter/securityrole/policy/helpdesk.md
@@ -241,22 +241,9 @@ As part of the Helpdesk policy, you can:
 - Force end-users to change the password the next time they sign to their workstations.
 
 :::tip
-<<<<<<< HEAD
-:::tip
-:::tip
-Remember, These settings are available if the _Reset Any Password_ permission is granted to the
-Helpdesk role in the identity store.
-:::
-:::
-:::
-
-
-=======
 Remember, These settings are available if the _Reset Any Password_ permission is granted to the
 Helpdesk role in the identity store.
 :::
->>>>>>> origin/dev
-
 
 ### Specify a Password Reset Method
 
diff --git a/docs/directorymanager/11.1/install/configure/setupauthentication.md b/docs/directorymanager/11.1/install/configure/setupauthentication.md
@@ -24,20 +24,10 @@ Authentication mode setup, you do not need to add the account to the _db_owner_
 Server _db_creator_ is mapped to the _db_owner_ database role by default.
 
 :::note
-<<<<<<< HEAD
-:::note
-=======
->>>>>>> origin/dev
 For SQL Server 2016, 2017, 2019 and 2022 families, every SQL Server account is assigned
 the _public_ role. Therefore, the Directory Manager SQL account belongs to two server roles:
 _db_creator_ and _public_.
 :::
-<<<<<<< HEAD
-:::
-
-=======
->>>>>>> origin/dev
-
 
 To add the Directory Manager SQL account to the db_creator role:
 
diff --git a/docs/directorymanager/11.1/portal/group/create/EntraID/group.md b/docs/directorymanager/11.1/portal/group/create/EntraID/group.md
@@ -57,21 +57,10 @@ Follow the steps to create a Smart Group.
     The **Create Group** wizard opens to the **Group Type** page.
 
     :::tip
-<<<<<<< HEAD
-        :::tip
-                :::tip
-                                Remember, pages and fields on the Create Group wizard may vary, since the administrator can
-                customize the wizard by adding or removing tabs and fields.
-                :::
-                :::
-                :::
-
-
-=======
-        Remember, pages and fields on the Create Group wizard may vary, since the administrator can
+    Remember, pages and fields on the Create Group wizard may vary, since the administrator can
     customize the wizard by adding or removing tabs and fields.
     :::
->>>>>>> origin/dev
+
 
 
 2. On the [Group Type page](/docs/directorymanager/11.1/portal/group/create/grouptype.md) page, select the **Smart Group** option button and
diff --git a/docs/directorymanager/11.1/portal/group/dynasty/AD/createdynasty.md b/docs/directorymanager/11.1/portal/group/dynasty/AD/createdynasty.md
@@ -37,11 +37,6 @@ You cannot create mail-enabled Dynasties of the Office 365 group type in a Micro
 based identity store, since an Office 365 group cannot have groups as its members. Only non
 mail-enabled Dynasties of the security group type are supported.
 :::
-<<<<<<< HEAD
-
-=======
->>>>>>> origin/dev
-
 
 **Naming conventions for Child Dynasties**
 
diff --git a/docs/directorymanager/11.1/portal/group/properties/dynastyoptions.md b/docs/directorymanager/11.1/portal/group/properties/dynastyoptions.md
@@ -36,7 +36,6 @@ length must not exceed the number of characters supported by the respective mess
 Also, the alias must not contain characters that are invalid for the configured messaging system.
 The following table lists the valid characters the supported messaging systems.
 
-<<<<<<< HEAD
 | Messaging System                                                 | Valid Characters                                                                                                                                                                                                                                                                                           |
 | ---------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | Exchange Server 2013, Exchange Server 2016, Exchange Server 2019 | - Uppercase letters (A–Z) - Lowercase letters (a–z) - Numeric digits (0–9) - Special characters: `#`, `---
@@ -86,7 +85,6 @@ The following table lists the valid characters the supported messaging systems.
 | --- | --- |
 | Exchange Server 2013, Exchange Server 2016, Exchange Server 2019 | <ul><li>Uppercase letters (A–Z)</li><li>Lowercase letters (a–z)</li><li>Numeric digits (0–9)</li><li>Special characters: `#`, `$`, `%`, `&`, `'`, `*`, `+`, `-`, `/`, `=`, `?`, `^`, `_`, `` ` ``, `\{`, `\|`, `\}`, `~` - Periods (`.`) are allowed, but each must be preceded and followed by at least one other valid character</li></ul> |
 | All other messaging systems                                      | <ul><li>Uppercase letters (A–Z)</li><li>Lowercase letters (a–z)</li><li>Numeric digits (0–9)</li></ul> |
->>>>>>> origin/dev
 
 **Display Name Template**
 
@@ -211,7 +209,6 @@ length must not exceed the number of characters supported by the respective mess
 Also, the alias must not contain characters that are invalid for the configured messaging system.
 The following table lists the valid characters the supported messaging systems.
 
-<<<<<<< HEAD
 | Messaging System                                                 | Valid Characters                                                                                                                                                                                                                                                                                                            |
 | ---------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | Exchange Server 2013, Exchange Server 2016, Exchange Server 2019 | - Uppercase letters (`A–Z`) - Lowercase letters (`a–z`) - Numeric digits (`0–9`) - Special characters: `#`, `---
@@ -424,13 +421,6 @@ The following table lists the valid characters the supported messaging systems.
 | ---------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 , `%`, `&`, `'`, `*`, `+`, `-`, `/`, `=`, `?`, `^`, `_`, `` ` ``, `\{`, `\|`, `\}`, `~` - Periods (`.`) are allowed in aliases, but each must be preceded and followed by at least one other valid character |
 | All other messaging systems                                      | - Uppercase letters (`A–Z`) - Lowercase letters (`a–z`) - Numeric digits (`0–9`)                                                                                                                                                                                                                                            |
-=======
-| Messaging System | Valid Characters |
-| --- | --- |
-| Exchange Server 2013, Exchange Server 2016, Exchange Server 2019 | <ul><li>Uppercase letters (`A–Z`)</li><li>Lowercase letters (`a–z`)</li><li>Numeric digits (`0–9`)</li><li>Special characters: `#`, `$`, `%`, `&`, `'`, `*`, `+`, `-`, `/`, `=`, `?`, `^`, `_`, `` ` ``, `\{`, `\|`, `\}`, `~` - Periods (`.`) are allowed in aliases, but each must be preceded and followed by at least one other valid character</li></ul> |
-| All other messaging systems | <ul><li>Uppercase letters (`A–Z`)</li><li>Lowercase letters (`a–z`)</li><li>Numeric digits (`0–9`)</li></ul> |
->>>>>>> origin/dev
-
 **Display Name Template**
 
 The template is used to generate the display names of the Dynasty's child groups. **%MANAGER%** is
diff --git a/docs/directorymanager/11.1/portal/group/properties/owner.md b/docs/directorymanager/11.1/portal/group/properties/owner.md
@@ -80,10 +80,6 @@ The **Additional Owners** grid displays the following information:
 | Ending | Displays the ending date of the temporary addition or removal. |
 | Do not notify | By default, all group-related notifications (such as expiry, deletion, and renewal notifications) are sent to the primary owner and all additional owners, so they can take the necessary action indicated. <br />To exclude an additional owner from receiving notifications, select the **Do not notify** check box. <br />**NOTE:** When a Smart Group Update job runs on a group, the notification behavior is as follows: Even when the **Do not Notify** check box is selected, the additional owner will receive the notifications if the administrator has included its email address for job-specific notifications. |
 
-<<<<<<< HEAD
-=======
-
->>>>>>> origin/dev
 :::note
 For each column, a filter is also available that lets you filter records based on a criterion.
 For example; to show objects whose display names start with D, type D in the box under the **Name**
diff --git a/docs/directorymanager/11.1/portal/login.md b/docs/directorymanager/11.1/portal/login.md
@@ -61,11 +61,6 @@ Step 4 – After providing your credentials, click **Sign In**.
 Microsoft Entra ID MFA enabled users cannot log into Directory Manager using their username
 and password. They will be authenticated through the SAML provider configured in Directory Manager.
 :::
-<<<<<<< HEAD
-
-=======
->>>>>>> origin/dev
-
 
 **With a SAML Provider**
 
diff --git a/docs/directorymanager/11.1/portal/user/properties/AD/useroverview/organization.md b/docs/directorymanager/11.1/portal/user/properties/AD/useroverview/organization.md
@@ -38,11 +38,6 @@ This is the default flow for the ‘Workflow to Change Manager’ workflow, with
 manager set as the approver. If the administrator disables the workflow or changes the workflow
 approver, the flow changes accordingly. See the [Requests](/docs/directorymanager/11.1/portal/request/overview.md) topic.
 :::
-<<<<<<< HEAD
-
-=======
->>>>>>> origin/dev
-
 
 **Manager**
 
@@ -99,10 +94,6 @@ This section displays a list of the additional managers of the user or contact.
 | Beginning    | Shows the beginning date of the temporary addition or removal.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
 | Ending       | Shows the ending date of the temporary addition or removal.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
 
-<<<<<<< HEAD
-=======
-
->>>>>>> origin/dev
 :::note
 For each column, a filter is also available that lets you filter records based on a criterion.
 For example; to show objects whose display names start with D, type D in the box under the Name
diff --git a/docs/directorymanager/11.1/portal/user/properties/EntraID/identity.md b/docs/directorymanager/11.1/portal/user/properties/EntraID/identity.md
@@ -41,11 +41,6 @@ The User Type has no link to the user login function, the directory role of the
 on. It simply indicates the user's relationship to the host organization and allows the organization
 to enforce policies that depend on this property.
 :::
-<<<<<<< HEAD
-
-=======
->>>>>>> origin/dev
-
 
 **Object ID**
 
