resolve merge conflict

Author: b-ahibbard

.openpublishing.publish.config.json

@@ -410,6 +410,12 @@
       "branch": "main",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "azureml-examples-batch-pup",
+      "url": "https://github.com/azure/azureml-examples",
+      "branch": "santiagxf/batch-pup",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "azureml-examples-mavaisma-r-azureml",
       "url": "https://github.com/azure/azureml-examples",
@@ -434,6 +440,12 @@
       "branch": "main",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "azureml-examples-featurestore",
+      "url": "https://github.com/Azure/azureml-examples",
+      "branch": "featurestore/pup",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "terraform",
       "url": "https://github.com/Azure/terraform",
@@ -728,6 +740,12 @@
       "branch": "main",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "web-apps-node-iot-hub-data-visualization",
+      "url": "https://github.com/azure-samples/web-apps-node-iot-hub-data-visualization",
+      "branch": "master",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "ImmersiveReaderSdk",
       "url": "https://github.com/microsoft/immersive-reader-sdk",
@@ -897,15 +915,15 @@
       "branch_mapping": {}
     },
     {
-      "path_to_root": "ms-identity-python-webapp",
+      "path_to_root": "ms-identity-python-webapp-quickstart",
       "url": "https://github.com/Azure-Samples/ms-identity-python-webapp",
-      "branch": "main",
+      "branch": "0.7.0",
       "branch_mapping": {}
     },
     {
       "path_to_root": "ms-identity-python-webapp-tutorial",
       "url": "https://github.com/Azure-Samples/ms-identity-python-webapp",
-      "branch": "0.5.0",
+      "branch": "0.6.0",
       "branch_mapping": {}
     },
     {
@@ -979,7 +997,13 @@
       "url": "https://github.com/MicrosoftGraph/microsoft-graph-docs",
       "branch": "main",
       "branch_mapping": {}
-    }
+    },
+    {
+      "path_to_root": "azure-actions-workflow-samples",
+      "url": "https://github.com/Azure/actions-workflow-samples",
+      "branch": "master",
+      "branch_mapping": {}
+    }  
   ],
   "branch_target_mapping": {
     "live": ["Publish", "PDF"],
@@ -1056,6 +1080,7 @@
   "articles/load-testing/.openpublishing.redirection.azure-load-testing.json",
   "articles/logic-apps/.openpublishing.redirection.logic-apps.json",
   "articles/machine-learning/.openpublishing.redirection.machine-learning.json",
+  "articles/machine-learning/v1/.openpublishing.redirection.machine-learning-v1.json",
   "articles/mariadb/.openpublishing.redirection.mariadb.json",
   "articles/marketplace/.openpublishing.redirection.marketplace.json",
   "articles/mysql/.openpublishing.redirection.mysql.json",
@@ -1073,6 +1098,7 @@
   "articles/virtual-machine-scale-sets/.openpublishing.redirection.virtual-machine-scale-sets.json",
   "articles/virtual-machines/.openpublishing.redirection.virtual-machines.json",
   "articles/dev-box/.openpublishing.redirection.dev-box.json",
-  "articles/deployment-environments/.openpublishing.redirection.deployment-environments.json"
+  "articles/deployment-environments/.openpublishing.redirection.deployment-environments.json",
+  "articles/network-watcher/.openpublishing.redirection.network-watcher.json"
 ]
 }