[AzureAD-MFA] Resolve upstream merge conflict

Author: iainfoulds

.gitignore

@@ -22,5 +22,5 @@ articles/directories.txt
 AzureMigration.ps1
 
 !/.vscode/extensions.json
-articles/data-lake-analytics/.vscode/settings.json
 .gitignore
+**/.vscode/settings.json

.markdownlint.json

@@ -9,6 +9,7 @@
     "MD007": false,
     "MD009": false,
     "MD010": false,
+    "MD011": true,
     "MD012": false,
     "MD013": false,
     "MD014": false,
@@ -32,10 +33,28 @@
     "MD035": false,
     "MD036": false,
     "MD037": false,
+    "MD038": true,
+    "MD039": true,
     "MD040": false,
     "MD041": false,
     "MD042": false,
+    "MD043": true,
+    "MD044": {
+        "code_blocks": false,
+        "names": [
+            ".NET",
+            "ASP.NET",
+            "Azure",
+            "JavaScript",
+            "NuGet",
+            "PowerShell",
+            "macOS",
+            "C#",
+            "CLI"
+        ]
+    },
     "MD045": false,
     "MD046": false,
-    "MD047": false
+    "MD047": false,
+    "MD048": true
 }

.openpublishing.publish.config.json

@@ -146,6 +146,12 @@
       "url": "https://github.com/Azure/azure-functions-durable-extension",
       "branch": "master"
     },
+    {
+      "path_to_root": "functions-python-tensorflow-tutorial",
+      "url": "https://github.com/Azure-Samples/functions-python-tensorflow-tutorial",
+      "branch": "master",
+      "branch_mapping": {}
+    },    
     {
       "path_to_root": "samples-personalizer",
       "url": "https://github.com/Azure-Samples/cognitive-services-personalizer-samples",