From 241b6b36fc1128d0ee7e5c2316e7c71510f9586f Mon Sep 17 00:00:00 2001 From: "Francois @fanf42 Armand" Date: Mon, 3 Oct 2022 15:49:09 +0200 Subject: [PATCH] Fixes #21897: OIDC doc contains a merge diff resolution comment --- auth-backends/README.adoc | 7 ------- 1 file changed, 7 deletions(-) diff --git a/auth-backends/README.adoc b/auth-backends/README.adoc index f2f5e892b..763f13e92 100644 --- a/auth-backends/README.adoc +++ b/auth-backends/README.adoc @@ -389,15 +389,8 @@ rudder.auth.oauth2.provider.okta.client.redirect=https://my-external-rudder-host # # The protocol scheme used for authentication - Rudder only supports with authorisation code. rudder.auth.oauth2.provider.okta.grantType=authorization_code -<<<<<<< HEAD -# Rudder URL towards which the identity provider redirects -rudder.auth.oauth2.provider.okta.client.redirect=https://my-external-rudder-hostname/rudder/login/oauth2/code/{registrationId} -# Authentication type - Rudder only supports basic. -rudder.auth.oauth2.provider.okta.authMethod=basic -======= # Authentication type - Rudder only supports client_secret_basic and client_secret_post. rudder.auth.oauth2.provider.okta.authMethod=client_secret_basic ->>>>>>> branches/rudder/6.2 ```