From 5b0ae0b92d4ee2af11340b60cbde66fdae117f68 Mon Sep 17 00:00:00 2001 From: Samay Bhojwani <samaybhojwani@nebraska.edu> Date: Mon, 14 Apr 2025 14:11:09 -0500 Subject: [PATCH] resolved merge conflicts --- oidc/edu.unl.lstit-door.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/oidc/edu.unl.lstit-door.xml b/oidc/edu.unl.lstit-door.xml index 09916b1..70808ba 100644 --- a/oidc/edu.unl.lstit-door.xml +++ b/oidc/edu.unl.lstit-door.xml @@ -17,11 +17,6 @@ </md:KeyDescriptor> <md:NameIDFormat>urn:mace:shibboleth:metadata:oidc:1.0:nameid-format:public</md:NameIDFormat> <md:AssertionConsumerService -<<<<<<< HEAD - Binding="https://tools.ietf.org/html/rfc6749#section-3.1.2" - Location="https://LSTIT-DOOR.unl.edu/AIUniversal/Account/RegisterExternalLogin.aspx" - index="1"/> -======= Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://LSTIT-DOOR.unl.edu/AIUniversal/Account/RegisterExternalLogin.aspx" index="1"/> @@ -30,6 +25,5 @@ Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://LSTIT-DOORTEST.unl.edu/AIUniversal/Account/RegisterExternalLogin.aspx" index="2"/> ->>>>>>> 518-update-oidc-metadata-scopes </md:SPSSODescriptor> </md:EntityDescriptor> -- GitLab