Skip to content

Commit 10e8740

Browse files
authored
Merge branch 'release-durable-task' into release-durable-task
2 parents 14c456b + dfe840a commit 10e8740

1 file changed

Lines changed: 3 additions & 0 deletions

File tree

.openpublishing.redirection.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"redirections": [
33
{
4+
<<<<<<< release-durable-task
45
"source_path": "articles/sentinel/datalake/sentinel-mcp-chatgpt-connector.md",
56
"redirect_url": "/azure/sentinel/datalake/sentinel-mcp-chatgpt-claude-connector",
67
"redirect_document_id": false
@@ -280,6 +281,8 @@
280281
"redirect_document_id": false
281282
},
282283
{
284+
=======
285+
>>>>>>> release-durable-task
283286
"source_path": "articles/migrate/best-practices-assessment.md",
284287
"redirect_url": "/previous-versions/azure/migrate/best-practices-assessment",
285288
"redirect_document_id": false,

0 commit comments

Comments
 (0)