Fixed active-directory.json merge conflict

rahul-nagraj · rahul-nagraj · commit 5122618ff437 · 2022-09-02T09:49:52.000+01:00
diff --git a/.openpublishing.redirection.active-directory.json b/.openpublishing.redirection.active-directory.json
@@ -10832,7 +10832,6 @@
       "redirect_document_id": false
     },
     {
-      "source_path_from_root": "/articles/active-directory/manage-apps/recover-deleted-apps-faq.md",
       "source_path": "articles/active-directory/manage-apps/recover-deleted-apps-faq.md",
       "redirect_url": "/azure/active-directory/manage-apps/delete-recover-faq",
       "redirect_document_id": false

Original file line number	Diff line number	Diff line change
`@@ -10832,7 +10832,6 @@`
`10832`	`10832`	`"redirect_document_id": false`
`10833`	`10833`	`},`
`10834`	`10834`	`{`
`10835`		`- "source_path_from_root": "/articles/active-directory/manage-apps/recover-deleted-apps-faq.md",`
`10836`	`10835`	`"source_path": "articles/active-directory/manage-apps/recover-deleted-apps-faq.md",`
`10837`	`10836`	`"redirect_url": "/azure/active-directory/manage-apps/delete-recover-faq",`
`10838`	`10837`	`"redirect_document_id": false`