Skip to content
Snippets Groups Projects
Commit eb97754b authored by Ryan Rumbaugh's avatar Ryan Rumbaugh
Browse files

Fix conflict with myself

parents 635bca14 811ef423
Branches
No related tags found
1 merge request!583Resolve "Update Call Manager Cert"
...@@ -21586,7 +21586,6 @@ ...@@ -21586,7 +21586,6 @@
AX4GCisGAQQB1nkCBAIEggFuBIIBagFoAHYA3dzKNJXX4RYF55Uy+sef+D0cUN/bADoUEnYKLKy7 AX4GCisGAQQB1nkCBAIEggFuBIIBagFoAHYA3dzKNJXX4RYF55Uy+sef+D0cUN/bADoUEnYKLKy7
yCoAAAGRglo/mQAABAMARzBFAiEArlpC4+5w24vrDwHELlS1NxA+srlDcefDwtysL7mBfFwCIClV yCoAAAGRglo/mQAABAMARzBFAiEArlpC4+5w24vrDwHELlS1NxA+srlDcefDwtysL7mBfFwCIClV
y9NBvk5LwLCGYr4QsyC0BkXsfCeeuHuBdIvd+tY7AHYADeHyMCvTDcFAYhIJ6lUu/Ed0fLHX6TDv y9NBvk5LwLCGYr4QsyC0BkXsfCeeuHuBdIvd+tY7AHYADeHyMCvTDcFAYhIJ6lUu/Ed0fLHX6TDv
DkIetH5OqjQAAAGRglo/XgAABAMARzBFAiBMY7yt/W0/ljc16ZWgmN/5YCS2umPWfEe/71U+Okf/
OgIhALa4eu6QUQDaXjF15M6/RfK6eFxl5rxBePDUa2iwjQNZAHYAEvFONL1TckyEBhnDjz96E/jn OgIhALa4eu6QUQDaXjF15M6/RfK6eFxl5rxBePDUa2iwjQNZAHYAEvFONL1TckyEBhnDjz96E/jn
tWKHiJxtMAWE6+WGJjoAAAGRglo/XgAABAMARzBFAiAQw+W/j22QKf96yksjbvQpA9pglR9bVeXQ tWKHiJxtMAWE6+WGJjoAAAGRglo/XgAABAMARzBFAiAQw+W/j22QKf96yksjbvQpA9pglR9bVeXQ
GK8jNqmNsgIhAP/HuhYSmZg8I6mtqW8UdinzzXEIckRsPckT5XLPFAjDMIHVBgNVHREEgc0wgcqC GK8jNqmNsgIhAP/HuhYSmZg8I6mtqW8UdinzzXEIckRsPckT5XLPFAjDMIHVBgNVHREEgc0wgcqC
...@@ -21600,26 +21599,6 @@ ...@@ -21600,26 +21599,6 @@
PEqhC9tfPkaeP3EZphyFaCqwottulLU/HpB977Yxy8vFlxxkvY1A39HacveZPXa+mzd8rPxbLuxm PEqhC9tfPkaeP3EZphyFaCqwottulLU/HpB977Yxy8vFlxxkvY1A39HacveZPXa+mzd8rPxbLuxm
nsyEpbk4wkULdNI2FXX//y8+UcoW nsyEpbk4wkULdNI2FXX//y8+UcoW
</ds:X509Certificate> </ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
<NameIDFormat>
urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
Location="https://voip-sec-pres-1.unl.edu:8443/ssosp/saml/SSO/alias/voip-sec-pres-1.unl.edu"
index="0" />
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
Location="https://voip-sec-pres-1.unl.edu:8443/ssosp/saml/SSO/alias/voip-sec-pres-1.unl.edu"
index="1" />
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
Location="https://voip-sec-cucm-2.unl.edu:8443/ssosp/saml/SSO/alias/voip-sec-cucm-2.unl.edu"
index="2" />
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
Location="https://voip-sec-cucm-2.unl.edu:8443/ssosp/saml/SSO/alias/voip-sec-cucm-2.unl.edu"
index="3" />
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
Location="https://voip-molr-pres-1.unl.edu:8443/ssosp/saml/SSO/alias/voip-molr-pres-1.unl.edu"
index="4" />
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
Location="https://voip-molr-pres-1.unl.edu:8443/ssosp/saml/SSO/alias/voip-molr-pres-1.unl.edu" Location="https://voip-molr-pres-1.unl.edu:8443/ssosp/saml/SSO/alias/voip-molr-pres-1.unl.edu"
index="5" /> index="5" />
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment