resolving merge conflict

Author: farah-alyasari

.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",