Skip to content

Commit f799ecf

Browse files
committed
Resolve merge conflicts by implementing code changes from PR 305367
2 parents 4e76298 + 1bcf935 commit f799ecf

11,696 files changed

Lines changed: 147259 additions & 165992 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.openpublishing.publish.config.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -500,6 +500,12 @@
500500
"branch": "v1.x",
501501
"branch_mapping": {}
502502
},
503+
{
504+
"path_to_root": "functions-scenarios-quickstart-sql",
505+
"url": "https://github.com/Azure-Samples/functions-quickstart-dotnet-azd-sql",
506+
"branch": "main",
507+
"branch_mapping": {}
508+
},
503509
{
504510
"path_to_root": "functions-sql-todo-sample",
505511
"url": "https://github.com/Azure-Samples/azure-sql-binding-func-dotnet-todo",
@@ -632,6 +638,12 @@
632638
"branch": "main",
633639
"branch_mapping": {}
634640
},
641+
{
642+
"path_to_root": "app-service-agentic-langgraph-foundry-python",
643+
"url": "https://github.com/Azure-Samples/app-service-agentic-langgraph-foundry-python",
644+
"branch": "main",
645+
"branch_mapping": {}
646+
},
635647
{
636648
"path_to_root": "app-service-agentic-semantic-kernel-java",
637649
"url": "https://github.com/Azure-Samples/app-service-agentic-semantic-kernel-java",

0 commit comments

Comments
 (0)