resolve conflicts and merge

1 files changed, 0 insertions, 65 deletions

diff --git a/swamid-interfederations-2.0/payments.balliol.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/payments.balliol.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index d3bee98f..00000000
--- a/swamid-interfederations-2.0/payments.balliol.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://payments.balliol.ox.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth Balliol Payments SP for University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-20T10:54:03Z"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://payments.balliol.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDEjCCAfqgAwIBAgIJAPvOedFZEvkcMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
-						BAMTGXBheW1lbnRzLmJhbGxpb2wub3guYWMudWswHhcNMTIwNDE3MjA1NTM3WhcN
-						MjIwNDE1MjA1NTM3WjAkMSIwIAYDVQQDExlwYXltZW50cy5iYWxsaW9sLm94LmFj
-						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwFpid6d55DBZOLIs
-						xpDcZGgKfqu6Gm/T/ZVJY3AOj5BjTdjCiLn57FpMEkyCci7wODhEnTl7M1DFhVpo
-						CskYhETMeERTP9C2vNco/X3UdCtkPR2ZWs/yBGraqBkyeg4kx7U6+trEwO+Sqirj
-						2AHrPOwBJgtyIUGVsXgF9o54bptyQQsHIUX7+XPW7stiZ5X035HR5tB6hjfoZoRe
-						skzs6kploPCCxN8dL83lYw8VdYHWyvQmgXL4fsqTGaULcUGEjhekubGxIFL5xQRF
-						l3oWY4sIz5x9FMkbwt2S8NQzQokbvKpQcntotUMHYik1fLU/0QVoTEj0PR7en4GO
-						guTiNQIDAQABo0cwRTAkBgNVHREEHTAbghlwYXltZW50cy5iYWxsaW9sLm94LmFj
-						LnVrMB0GA1UdDgQWBBTP8wkRhzQFe7iXTxZIrPIt8T4xtTANBgkqhkiG9w0BAQUF
-						AAOCAQEADgadkCnPCWgs1Y0S3Uz5ErkdPvxNlTx0Qau1DxXx2QOwqVvc55xyNcKt
-						s6MJ4dwlZPYWPZT2b1G49pmUUMUp87XD1M6melhm2IzcTbyRJrA+KoSAFEL/hEBp
-						z8MrOtNI5/IPFfZOpwvoJMdUb2wxAscU+CoEa9HF+YndCPZmscMYOE3D3/3g+hAE
-						CC7AGt/AG6LsibsXDiL7RB3S0844C/T32nam6C59kwWg0CWWQuZIY+9xZDctOgIb
-						IDoUKfE1W4rdUtZ3bT+Ra7wnX0tmfUBlBc/h/38W9wQV1kqa3tnH8BEuC0Jpqcq4
-						U0MKDSCQFv1ZBA4ckzGCSivlU9HSig==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://payments.balliol.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://payments.balliol.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://payments.balliol.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://payments.balliol.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://payments.balliol.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://payments.balliol.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://payments.balliol.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://payments.balliol.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://payments.balliol.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://payments.balliol.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://payments.balliol.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford: Balliol Payments</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.balliol.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Stewart</GivenName>
-    <SurName>Tolhurst</SurName>
-    <EmailAddress>mailto:stewart.tolhurst@balliol.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Stewart</GivenName>
-    <SurName>Tolhurst</SurName>
-    <EmailAddress>mailto:stewart.tolhurst@balliol.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>