merge more conflicts

lizgt2000 · lizgt2000 · commit a38920058f18 · 2022-10-04T11:10:36.000-04:00
diff --git a/memdocs/configmgr/develop/compliance/about-authoring-configuration-baselines-and-configuration-items.md b/memdocs/configmgr/develop/compliance/about-authoring-configuration-baselines-and-configuration-items.md
@@ -7,11 +7,7 @@ ms.technology: configmgr-sdk
 ms.topic: conceptual
 ms.assetid: 39e47528-ea59-4d32-8baf-d017d3a44426
 author: Banreet
-<<<<<<< HEAD
-ms.author: aaroncz
-=======
 ms.author: banreetkaur
->>>>>>> 82de8759a8986955d2c715d9123b1cafbe6e6137
 manager: apoorvseth
 ms.localizationpriority: null
 ms.collection: tier3
diff --git a/memdocs/configmgr/develop/compliance/about-compliance-settings--dcm--extensibility.md b/memdocs/configmgr/develop/compliance/about-compliance-settings--dcm--extensibility.md
@@ -8,11 +8,7 @@ ms.technology: configmgr-sdk
 ms.topic: conceptual
 ms.assetid: 0f9532cc-058c-46cf-8181-469cd6e1734b
 author: Banreet
-<<<<<<< HEAD
-ms.author: aaroncz
-=======
 ms.author: banreetkaur
->>>>>>> 82de8759a8986955d2c715d9123b1cafbe6e6137
 manager: apoorvseth
 ms.localizationpriority: null
 ms.collection: tier3
diff --git a/memdocs/configmgr/develop/compliance/about-compliance-settings--dcm--setup-and-configuration.md b/memdocs/configmgr/develop/compliance/about-compliance-settings--dcm--setup-and-configuration.md
@@ -7,11 +7,7 @@ ms.technology: configmgr-sdk
 ms.topic: conceptual
 ms.assetid: 0ec16fc6-0775-4c7b-92db-a28f079c3404
 author: Banreet
-<<<<<<< HEAD
-ms.author: aaroncz
-=======
 ms.author: banreetkaur
->>>>>>> 82de8759a8986955d2c715d9123b1cafbe6e6137
 manager: apoorvseth
 ms.localizationpriority: null
 ms.collection: tier3
diff --git a/memdocs/configmgr/develop/compliance/about-configuration-baselines-and-configuration-items.md b/memdocs/configmgr/develop/compliance/about-configuration-baselines-and-configuration-items.md
@@ -8,11 +8,7 @@ ms.technology: configmgr-sdk
 ms.topic: conceptual
 ms.assetid: 56bdef4b-bcf8-46f5-bf92-d86e0dfce08d
 author: Banreet
-<<<<<<< HEAD
-ms.author: aaroncz
-=======
 ms.author: banreetkaur
->>>>>>> 82de8759a8986955d2c715d9123b1cafbe6e6137
 manager: apoorvseth
 ms.localizationpriority: null
 ms.collection: tier3
diff --git a/memdocs/configmgr/develop/compliance/about-configuration-baselines.md b/memdocs/configmgr/develop/compliance/about-configuration-baselines.md
@@ -8,11 +8,7 @@ ms.technology: configmgr-sdk
 ms.topic: conceptual
 ms.assetid: 23847c17-73c3-44b8-a163-e1f62576d4bb
 author: Banreet
-<<<<<<< HEAD
-ms.author: aaroncz
-=======
 ms.author: banreetkaur
->>>>>>> 82de8759a8986955d2c715d9123b1cafbe6e6137
 manager: apoorvseth
 ms.localizationpriority: null
 ms.collection: tier3
diff --git a/memdocs/configmgr/develop/compliance/about-general-configuration-items.md b/memdocs/configmgr/develop/compliance/about-general-configuration-items.md
@@ -8,11 +8,7 @@ ms.technology: configmgr-sdk
 ms.topic: conceptual
 ms.assetid: 68b138f8-d6ba-4e71-a82a-cb2bb224e972
 author: Banreet
-<<<<<<< HEAD
-ms.author: aaroncz
-=======
 ms.author: banreetkaur
->>>>>>> 82de8759a8986955d2c715d9123b1cafbe6e6137
 manager: apoorvseth
 ms.localizationpriority: null
 ms.collection: tier3
diff --git a/memdocs/configmgr/develop/compliance/about-operating-system-configuration-item-examples.md b/memdocs/configmgr/develop/compliance/about-operating-system-configuration-item-examples.md
@@ -8,11 +8,7 @@ ms.technology: configmgr-sdk
 ms.topic: conceptual
 ms.assetid: 4ae63925-e6a8-43a9-b3bc-91d640568a44
 author: Banreet
-<<<<<<< HEAD
-ms.author: aaroncz
-=======
 ms.author: banreetkaur
->>>>>>> 82de8759a8986955d2c715d9123b1cafbe6e6137
 manager: apoorvseth
 ms.localizationpriority: null
 ms.collection: tier3
diff --git a/memdocs/configmgr/develop/compliance/application-configuration-item-example-1.md b/memdocs/configmgr/develop/compliance/application-configuration-item-example-1.md
@@ -8,11 +8,7 @@ ms.technology: configmgr-sdk
 ms.topic: conceptual
 ms.assetid: adc63f00-8fcf-4212-910a-26ae9154d574
 author: Banreet
-<<<<<<< HEAD
-ms.author: aaroncz
-=======
 ms.author: banreetkaur
->>>>>>> 82de8759a8986955d2c715d9123b1cafbe6e6137
 manager: apoorvseth
 ms.localizationpriority: null
 ms.collection: tier3
diff --git a/memdocs/configmgr/develop/compliance/application-configuration-item-example-2.md b/memdocs/configmgr/develop/compliance/application-configuration-item-example-2.md
@@ -8,11 +8,7 @@ ms.technology: configmgr-sdk
 ms.topic: conceptual
 ms.assetid: f359d17d-d2dc-4b34-9e1b-5c5c1d5fe060
 author: Banreet
-<<<<<<< HEAD
-ms.author: aaroncz
-=======
 ms.author: banreetkaur
->>>>>>> 82de8759a8986955d2c715d9123b1cafbe6e6137
 manager: apoorvseth
 ms.localizationpriority: null
 ms.collection: tier3
diff --git a/memdocs/configmgr/develop/compliance/configuration-baseline-example-1.md b/memdocs/configmgr/develop/compliance/configuration-baseline-example-1.md
@@ -7,11 +7,7 @@ ms.technology: configmgr-sdk
 ms.topic: conceptual
 ms.assetid: 488ff3c1-2bc0-49a0-b925-ab6f41c9561f
 author: Banreet
-<<<<<<< HEAD
-ms.author: aaroncz
-=======
 ms.author: banreetkaur
->>>>>>> 82de8759a8986955d2c715d9123b1cafbe6e6137
 manager: apoorvseth
 ms.localizationpriority: null
 ms.collection: tier3
diff --git a/memdocs/configmgr/develop/compliance/general-configuration-item-example-1.md b/memdocs/configmgr/develop/compliance/general-configuration-item-example-1.md
@@ -8,11 +8,7 @@ ms.technology: configmgr-sdk
 ms.topic: conceptual
 ms.assetid: 4c27ec03-c358-4244-a5c5-d0784e5b4713
 author: Banreet
-<<<<<<< HEAD
-ms.author: aaroncz
-=======
 ms.author: banreetkaur
->>>>>>> 82de8759a8986955d2c715d9123b1cafbe6e6137
 manager: apoorvseth
 ms.localizationpriority: null
 ms.collection: tier3
diff --git a/memdocs/configmgr/develop/compliance/how-to-assign-configuration-baselines.md b/memdocs/configmgr/develop/compliance/how-to-assign-configuration-baselines.md
@@ -7,11 +7,7 @@ ms.technology: configmgr-sdk
 ms.topic: how-to
 ms.assetid: 54a9b910-2ed2-480c-adc8-aa61201ae39e
 author: Banreet
-<<<<<<< HEAD
-ms.author: aaroncz
-=======
 ms.author: banreetkaur
->>>>>>> 82de8759a8986955d2c715d9123b1cafbe6e6137
 manager: apoorvseth
 ms.localizationpriority: null
 ms.collection: tier3
diff --git a/memdocs/configmgr/develop/compliance/how-to-configure-the-default-compliance-evaluation-schedule.md b/memdocs/configmgr/develop/compliance/how-to-configure-the-default-compliance-evaluation-schedule.md
@@ -8,11 +8,7 @@ ms.technology: configmgr-sdk
 ms.topic: how-to
 ms.assetid: 56d60eea-d506-4611-a489-0e719961d17a
 author: Banreet
-<<<<<<< HEAD
-ms.author: aaroncz
-=======
 ms.author: banreetkaur
->>>>>>> 82de8759a8986955d2c715d9123b1cafbe6e6137
 manager: apoorvseth
 ms.localizationpriority: null
 ms.collection: tier3
diff --git a/memdocs/configmgr/develop/compliance/how-to-enable-or-disable-the-compliance-settings--dcm--agent.md b/memdocs/configmgr/develop/compliance/how-to-enable-or-disable-the-compliance-settings--dcm--agent.md
@@ -8,11 +8,7 @@ ms.technology: configmgr-sdk
 ms.topic: how-to
 ms.assetid: bcb099cd-4433-4223-bb2e-23fdfd32fb41
 author: Banreet
-<<<<<<< HEAD
-ms.author: aaroncz
-=======
 ms.author: banreetkaur
->>>>>>> 82de8759a8986955d2c715d9123b1cafbe6e6137
 manager: apoorvseth
 ms.localizationpriority: null
 ms.collection: tier3
diff --git a/memdocs/configmgr/develop/compliance/how-to-export-configuration-baselines-and-configuration-items.md b/memdocs/configmgr/develop/compliance/how-to-export-configuration-baselines-and-configuration-items.md
@@ -7,11 +7,7 @@ ms.technology: configmgr-sdk
 ms.topic: how-to
 ms.assetid: 0599e22f-3de3-4182-bcc2-3175d91b5b58
 author: Banreet
-<<<<<<< HEAD
-ms.author: aaroncz
-=======
 ms.author: banreetkaur
->>>>>>> 82de8759a8986955d2c715d9123b1cafbe6e6137
 manager: apoorvseth
 ms.localizationpriority: null
 ms.collection: tier3
diff --git a/memdocs/configmgr/develop/compliance/how-to-import-configuration-baselines-and-configuration-items.md b/memdocs/configmgr/develop/compliance/how-to-import-configuration-baselines-and-configuration-items.md
@@ -8,11 +8,7 @@ ms.technology: configmgr-sdk
 ms.topic: how-to
 ms.assetid: 9ce05e8b-bd49-47d4-827d-3676a96c28a8
 author: Banreet
-<<<<<<< HEAD
-ms.author: aaroncz
-=======
 ms.author: banreetkaur
->>>>>>> 82de8759a8986955d2c715d9123b1cafbe6e6137
 manager: apoorvseth
 ms.localizationpriority: null
 ms.collection: tier3
diff --git a/memdocs/configmgr/develop/compliance/how-to-list-configuration-assignments.md b/memdocs/configmgr/develop/compliance/how-to-list-configuration-assignments.md
@@ -8,11 +8,7 @@ ms.technology: configmgr-sdk
 ms.topic: how-to
 ms.assetid: cd79bf83-591d-47b1-afdb-a23fbae90e58
 author: Banreet
-<<<<<<< HEAD
-ms.author: aaroncz
-=======
 ms.author: banreetkaur
->>>>>>> 82de8759a8986955d2c715d9123b1cafbe6e6137
 manager: apoorvseth
 ms.localizationpriority: null
 ms.collection: tier3
diff --git a/memdocs/configmgr/develop/compliance/operating-system-configuration-item-example-1.md b/memdocs/configmgr/develop/compliance/operating-system-configuration-item-example-1.md
@@ -8,11 +8,7 @@ ms.technology: configmgr-sdk
 ms.topic: conceptual
 ms.assetid: bee6d39d-fbf9-451e-bd3a-0330cc57d910
 author: Banreet
-<<<<<<< HEAD
-ms.author: aaroncz
-=======
 ms.author: banreetkaur
->>>>>>> 82de8759a8986955d2c715d9123b1cafbe6e6137
 manager: apoorvseth
 ms.localizationpriority: null
 ms.collection: tier3
diff --git a/memdocs/configmgr/develop/mdm/how-to-configure-mobile-device-client-agent-settings.md b/memdocs/configmgr/develop/mdm/how-to-configure-mobile-device-client-agent-settings.md
@@ -8,11 +8,7 @@ ms.technology: configmgr-sdk
 ms.topic: how-to
 ms.assetid: bb2e1e0a-095f-4b7d-92ba-29a89c8d8f69
 author: Banreet
-<<<<<<< HEAD
-ms.author: aaroncz
-=======
 ms.author: banreetkaur
->>>>>>> 82de8759a8986955d2c715d9123b1cafbe6e6137
 manager: apoorvseth
 ms.localizationpriority: null
 ms.collection: tier3
diff --git a/memdocs/configmgr/develop/mdm/how-to-create-software-distribution-packages-for-mobile-devices.md b/memdocs/configmgr/develop/mdm/how-to-create-software-distribution-packages-for-mobile-devices.md
@@ -8,11 +8,7 @@ ms.technology: configmgr-sdk
 ms.topic: how-to
 ms.assetid: 3becb7a9-cf6b-432b-85e7-a0087df0dbb6
 author: Banreet
-<<<<<<< HEAD
-ms.author: aaroncz
-=======
 ms.author: banreetkaur
->>>>>>> 82de8759a8986955d2c715d9123b1cafbe6e6137
 manager: apoorvseth
 ms.localizationpriority: null
 ms.collection: tier3
diff --git a/memdocs/configmgr/develop/osd/about-computer-management.md b/memdocs/configmgr/develop/osd/about-computer-management.md
@@ -8,11 +8,7 @@ ms.technology: configmgr-sdk
 ms.topic: conceptual
 ms.assetid: 57146de9-c8ca-480d-9f6f-41c88525b326
 author: Banreet
-<<<<<<< HEAD
-ms.author: aaroncz
-=======
 ms.author: banreetkaur
->>>>>>> 82de8759a8986955d2c715d9123b1cafbe6e6137
 manager: apoorvseth
 ms.localizationpriority: null
 ms.collection: tier3
diff --git a/memdocs/configmgr/develop/osd/about-configuration-manager-custom-action-client-applications.md b/memdocs/configmgr/develop/osd/about-configuration-manager-custom-action-client-applications.md
@@ -7,11 +7,7 @@ ms.prod: configuration-manager
 ms.technology: configmgr-sdk
 ms.topic: conceptual
 author: Banreet
-<<<<<<< HEAD
-ms.author: aaroncz
-=======
 ms.author: banreetkaur
->>>>>>> 82de8759a8986955d2c715d9123b1cafbe6e6137
 manager: apoorvseth
 ms.localizationpriority: null
 ms.collection: tier3
diff --git a/memdocs/configmgr/develop/osd/about-configuration-manager-custom-action-mof-files.md b/memdocs/configmgr/develop/osd/about-configuration-manager-custom-action-mof-files.md
@@ -8,11 +8,7 @@ ms.technology: configmgr-sdk
 ms.topic: conceptual
 ms.assetid: aa2b3692-f373-4c66-b22b-d14bfa0c58dd
 author: Banreet
-<<<<<<< HEAD
-ms.author: aaroncz
-=======
 ms.author: banreetkaur
->>>>>>> 82de8759a8986955d2c715d9123b1cafbe6e6137
 manager: apoorvseth
 ms.localizationpriority: null
 ms.collection: tier3
diff --git a/memdocs/configmgr/develop/osd/about-configuration-manager-custom-actions.md b/memdocs/configmgr/develop/osd/about-configuration-manager-custom-actions.md
@@ -8,11 +8,7 @@ ms.technology: configmgr-sdk
 ms.topic: conceptual
 ms.assetid: 894bd31a-0a51-403b-84e9-1cc4958dfa7c
 author: Banreet
-<<<<<<< HEAD
-ms.author: aaroncz
-=======
 ms.author: banreetkaur
->>>>>>> 82de8759a8986955d2c715d9123b1cafbe6e6137
 manager: apoorvseth
 ms.localizationpriority: null
 ms.collection: tier3
diff --git a/memdocs/configmgr/develop/osd/about-operating-system-deployment-driver-management.md b/memdocs/configmgr/develop/osd/about-operating-system-deployment-driver-management.md
@@ -8,11 +8,7 @@ ms.technology: configmgr-sdk
 ms.topic: conceptual
 ms.assetid: 789d981f-d0c5-447b-9d93-24d2e0eef5f0
 author: Banreet
-<<<<<<< HEAD
-ms.author: aaroncz
-=======
 ms.author: banreetkaur
->>>>>>> 82de8759a8986955d2c715d9123b1cafbe6e6137
 manager: apoorvseth
 ms.localizationpriority: null
 ms.collection: tier3
diff --git a/memdocs/configmgr/develop/osd/about-operating-system-deployment-image-management.md b/memdocs/configmgr/develop/osd/about-operating-system-deployment-image-management.md
@@ -8,11 +8,7 @@ ms.technology: configmgr-sdk
 ms.topic: conceptual
 ms.assetid: c996a3dc-fff5-4c15-a2ce-a9590969d75e
 author: Banreet
-<<<<<<< HEAD
-ms.author: aaroncz
-=======
 ms.author: banreetkaur
->>>>>>> 82de8759a8986955d2c715d9123b1cafbe6e6137
 manager: apoorvseth
 ms.localizationpriority: null
 ms.collection: tier3
diff --git a/memdocs/configmgr/develop/osd/about-operating-system-deployment-site-role-configuration.md b/memdocs/configmgr/develop/osd/about-operating-system-deployment-site-role-configuration.md
@@ -7,11 +7,7 @@ ms.technology: configmgr-sdk
 ms.topic: conceptual
 ms.assetid: 15ddea9d-e13a-4be2-a3f6-20eba1e4a678
 author: Banreet
-<<<<<<< HEAD
-ms.author: aaroncz
-=======
 ms.author: banreetkaur
->>>>>>> 82de8759a8986955d2c715d9123b1cafbe6e6137
 manager: apoorvseth
 ms.localizationpriority: null
 ms.collection: tier3
diff --git a/memdocs/configmgr/develop/osd/about-reporting-configuration-manager-custom-action-progress.md b/memdocs/configmgr/develop/osd/about-reporting-configuration-manager-custom-action-progress.md
@@ -8,11 +8,7 @@ ms.technology: configmgr-sdk
 ms.topic: conceptual
 ms.assetid: e1fe4037-cd2a-416d-afe4-8a2de2ba4f33
 author: Banreet
-<<<<<<< HEAD
-ms.author: aaroncz
-=======
 ms.author: banreetkaur
->>>>>>> 82de8759a8986955d2c715d9123b1cafbe6e6137
 manager: apoorvseth
 ms.localizationpriority: null
 ms.collection: tier3
diff --git a/memdocs/configmgr/develop/osd/how-to-add-a-boot-image-from-a-wim-file.md b/memdocs/configmgr/develop/osd/how-to-add-a-boot-image-from-a-wim-file.md
@@ -8,11 +8,7 @@ ms.technology: configmgr-sdk
 ms.topic: how-to
 ms.assetid: c995b2e6-c364-4d59-8bc7-d8ef3596a0fd
 author: Banreet
-<<<<<<< HEAD
-ms.author: aaroncz
-=======
 ms.author: banreetkaur
->>>>>>> 82de8759a8986955d2c715d9123b1cafbe6e6137
 manager: apoorvseth
 ms.localizationpriority: null
 ms.collection: tier3
