Update WAU.adml

Author: cyronis

Sources/Policies/ADMX/en-US/WAU.adml

@@ -42,21 +42,7 @@ If this policy is disabled or not configured, GPO Blacklist is not used.</string
       <string id="WhiteList_Name">Application GPO Whitelist</string>
       <string id="WhiteList_Explain">Provide the WinGet IDs of applications you want to include.
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-If this policy is disabled or not configured, GPO Whitelist is not used.</string>
-=======
-        If this policy is disabled or not configured, GPO Whitelist is not used.</string>
-      <string id="PinnedApps_Name">Application GPO Pinned Apps</string>
-      <string id="PinnedApps_Explain">Provide the WinGet IDs of applications you want to
-        pin to a specific version.
-        Use the format AppID=Version (e.g., Microsoft.PowerToys=0.70.*)
-
-        If this policy is disabled or not configured, GPO Pinned Apps is not used.</string>
->>>>>>> 76aa69a99a57f8628818e4fa8a9f885876958ff5
-=======
-If this policy is disabled or not configured, GPO Whitelist is not used.</string>
->>>>>>> b1620417244f7b64d63ee9570e85619b6d363a16
+If this policy is disabled or not configured, GPO Whitelist is not used.</string>>
       <string id="UseWhiteList_Name">Use WhiteList instead of BlackList</string>
       <string id="UseWhiteList_Explain">This policy setting specifies whether to use a Whitelist or not.
 
@@ -167,7 +153,6 @@ This helps prevent many devices from running the task at the exact same time. Th
 If this policy is enabled, the scheduled task will have a random delay set based on the time inputted.
 
 If this policy is disabled or not configured, the default no delay.</string>
-<<<<<<< HEAD
       <string id="EnablePinManagement_Name">Enable WAU Pin Management</string>
       <string id="EnablePinManagement_Explain">This policy setting enables or disables WAU Pin Management.
 
@@ -198,8 +183,6 @@ AppID=Version (one per line)
 
 If this policy is disabled or not configured, the default local pinned_apps.txt
 file is used (WAU InstallLocation).</string>
-=======
->>>>>>> b1620417244f7b64d63ee9570e85619b6d363a16
     </stringTable>
     <presentationTable>
       <presentation id="BlackList">
@@ -208,9 +191,6 @@ file is used (WAU InstallLocation).</string>
       <presentation id="WhiteList">
         <listBox refId="WhiteList">WhiteList:</listBox>
       </presentation>
-      <presentation id="PinnedApps">
-        <listBox refId="PinnedApps">Pinned Apps:</listBox>
-      </presentation>
       <presentation id="ListPath">
         <textBox refId="ListPath">
           <label>(URL/UNC/GPO/Local) Path:</label>
@@ -255,7 +235,6 @@ file is used (WAU InstallLocation).</string>
           <label>Random delay HH:mm</label>
         </textBox>
       </presentation>
-<<<<<<< HEAD
       <presentation id="PinnedApps">
         <listBox refId="PinnedApps">Pinned Apps (AppID=Version):</listBox>
       </presentation>
@@ -264,8 +243,6 @@ file is used (WAU InstallLocation).</string>
           <label>(URL/UNC/Local) Path:</label>
         </textBox>
       </presentation>
-=======
->>>>>>> b1620417244f7b64d63ee9570e85619b6d363a16
     </presentationTable>
   </resources>
 </policyDefinitionResources>