From 06958410d2d6ef7448216f67fccea32ec4a65510 Mon Sep 17 00:00:00 2001 From: Preetam-Das26 Date: Thu, 3 Oct 2024 19:25:18 +0530 Subject: [PATCH] merge changes --- docs/samples/config/mscolab/setup_saml2_backend.py.sample | 4 ---- 1 file changed, 4 deletions(-) diff --git a/docs/samples/config/mscolab/setup_saml2_backend.py.sample b/docs/samples/config/mscolab/setup_saml2_backend.py.sample index 9dd2d971b..941a2a4cc 100644 --- a/docs/samples/config/mscolab/setup_saml2_backend.py.sample +++ b/docs/samples/config/mscolab/setup_saml2_backend.py.sample @@ -32,11 +32,7 @@ class setup_saml2_backend: yaml_data["config"]["localhost_test_idp"]["key_file"] = \ f'{mscolab_settings.SSO_DIR}/key_mscolab.key' # set path to your mscolab key file yaml_data["config"]["localhost_test_idp"]["cert_file"] = \ -<<<<<<< HEAD - f'{mscolab_settings.MSCOLAB_SSO_DIR}/crt_mscolab.crt' # set path to your mscolab certificate file -======= f'{mscolab_settings.SSO_DIR}/crt_mscolab.crt' # set path to your mscolab certificate file ->>>>>>> 54854e1c408b7dd47889a575b83015260275af87 yaml_data["config"]["localhost_test_idp"]["metadata"]["local"][0] = \ f'{mscolab_settings.SSO_DIR}/idp.xml' # set path to your idp metadata xml file