fixing merge conflict

Author: barclayn

.openpublishing.redirection.active-directory.json

@@ -13436,8 +13436,7 @@
       "redirect_document_id": false
     },
     {
-<<<<<<< Updated upstream
-      "source_path_from_root": "/articles/active-directory/external-identities/customers/sample-single-page-application-angular.md",
+     "source_path_from_root": "/articles/active-directory/external-identities/customers/sample-single-page-application-angular.md",
       "redirect_url": "/azure/active-directory/external-identities/customers/sample-single-page-app-angular-sign-in",
       "redirect_document_id": false
     },
@@ -13466,9 +13465,7 @@
       "redirect_url": "/azure/active-directory/external-identities/customers/tutorial-single-page-app-react-sign-in-sign-out",
       "redirect_document_id": false
     },
-    
-=======
-      "source_path_from_root": "/articles/active-directory/fundamentals/active-directory-whatis.md",
+    { "source_path_from_root": "/articles/active-directory/fundamentals/active-directory-whatis.md",
       "redirect_url": "/azure/active-directory/fundamentals/whatis",
       "redirect_document_id": false
     },
@@ -13477,7 +13474,5 @@
       "redirect_url": "/azure/active-directory/fundamentals/services-id-authentication-support",
       "redirect_document_id": false
     }
-        
->>>>>>> Stashed changes
   ]
 }