SFI - Remediate ROPC and implicit grant flow

kengaderdus · kengaderdus · commit 815328853fc2 · 2024-10-08T16:07:40.000+03:00
diff --git a/articles/active-directory-b2c/application-types.md b/articles/active-directory-b2c/application-types.md
@@ -5,20 +5,10 @@ description: Learn about the types of applications you can use with Azure Active
 
 author: kengaderdus
 manager: CelesteDG
-<<<<<<< HEAD
 ms.service: azure-active-directory
 ms.topic: concept-article
 ms.date: 10/11/2024
-ms.subservice: B2C
-=======
-
-ms.service: active-directory
-
-ms.topic: concept-article
-ms.date: 10/11/2024
-ms.author: kengaderdus
 ms.subservice: b2c
->>>>>>> dd8ef5b667a2235a489a1df129e1ae3177e0f22f
 
 
 
diff --git a/articles/active-directory-b2c/partner-itsme.md b/articles/active-directory-b2c/partner-itsme.md
@@ -6,21 +6,10 @@ description: Learn how to integrate Azure AD B2C authentication with itsme OIDC
 
 author: gargi-sinha
 manager: martinco
-<<<<<<< HEAD
 ms.service: azure-active-directory
 ms.topic: how-to
 ms.date: 10/11/2024
-ms.subservice: B2C
-=======
-ms.service: active-directory
-author: kengaderdus
-manager: CelesteDG
-
-ms.topic: how-to
-ms.date: 10/11/2024
-ms.author: kengaderdus
 ms.subservice: b2c
->>>>>>> dd8ef5b667a2235a489a1df129e1ae3177e0f22f
 
 
 #Customer intent: As a developer integrating Azure AD B2C authentication with itsme OpenID Connect (OIDC), I want to configure the itsme Identity Provider in Azure AD B2C, so that users can sign in securely using their itsme digital ID app without the need for passwords or multiple PIN codes.
