resolve conflicts and merge

1 files changed, 0 insertions, 89 deletions

diff --git a/swamid-interfederations-2.0/blogs.it.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/blogs.it.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index c74f0d53..00000000
--- a/swamid-interfederations-2.0/blogs.it.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://blogs.it.ox.ac.uk/shibboleth">
-  <!--
-		This is a "IT Services Blogs" Shibboleth SP for the University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-04-19T07:45:28Z"/>
-  </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">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDIDCCAgigAwIBAgIJAO5WjU+14S9UMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-						BAMTEWJsb2dzLml0Lm94LmFjLnVrMB4XDTEzMDQxNzE3MDUyNFoXDTIzMDQxNTE3
-						MDUyNFowHDEaMBgGA1UEAxMRYmxvZ3MuaXQub3guYWMudWswggEiMA0GCSqGSIb3
-						DQEBAQUAA4IBDwAwggEKAoIBAQC/NAROlo2gIDwjaBYvpeZjeCAqkgbdtBeOP0/3
-						cib9XK7twO3pSxBOMIzi9ugl7pZZLs07F5xnsZiVm1ARfdkzuxibp752MhSJHtup
-						BUM7ltGqjcyzd6L6EDaN/tmbgahnz7J9aR9Udzq5sQ7GZi4ZHQdtRcbhOKBl49no
-						/+ERleWGKnlusYKPsHzXlzmtApCjkBFpQ9IfX70QSF7CzhMdSmBbjzifsYPqET+8
-						DYhEqXRG7/wKguZAh5SjxA5QqZPxDYAf9ZdAN9hAmLfA9FDjBYhErEXmarGjhSt8
-						I2wU1DJcyCnGSRi1QZNnArFjXtf0dSJXMqbpC0DkGz057DtxAgMBAAGjZTBjMEIG
-						A1UdEQQ7MDmCEWJsb2dzLml0Lm94LmFjLnVrhiRodHRwczovL2Jsb2dzLml0Lm94
-						LmFjLnVrL3NoaWJib2xldGgwHQYDVR0OBBYEFPmPa+TukWsGIl2/RDHAdOc0PqQ9
-						MA0GCSqGSIb3DQEBBQUAA4IBAQAgHD8SRXrO5EDHve1G4gz8j0BCtasDMI+cKpJF
-						Upa3vVWm1BW7FVvmqTRWXWINwb0phOKV1AhV3G2waCRRMnlCE+v/rlzIE79MUf6K
-						8dzME8hVrTz6Xug/IpjJUEc//YrIYHwGfRaT/eORlUNsIoyYfexp6pIh0mY2NGyw
-						yM827XYmiOC22BSY39au2iYWGSlIwxNNLewWZ6q5hoOXT5rz2c832cNW/gqslLde
-						8ml/l/rTR/v08q1mhPSN/EQppYXSBWnoAHW2lFmqC3XSrUqBd9xjU9fWX9ZjHWjQ
-						9bvV+ZPT6CP9dWRJJ0I9Yh50lBOGliCXKs50AqNCD5Qv6DVl
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDIDCCAgigAwIBAgIJAO5WjU+14S9UMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-						BAMTEWJsb2dzLml0Lm94LmFjLnVrMB4XDTEzMDQxNzE3MDUyNFoXDTIzMDQxNTE3
-						MDUyNFowHDEaMBgGA1UEAxMRYmxvZ3MuaXQub3guYWMudWswggEiMA0GCSqGSIb3
-						DQEBAQUAA4IBDwAwggEKAoIBAQC/NAROlo2gIDwjaBYvpeZjeCAqkgbdtBeOP0/3
-						cib9XK7twO3pSxBOMIzi9ugl7pZZLs07F5xnsZiVm1ARfdkzuxibp752MhSJHtup
-						BUM7ltGqjcyzd6L6EDaN/tmbgahnz7J9aR9Udzq5sQ7GZi4ZHQdtRcbhOKBl49no
-						/+ERleWGKnlusYKPsHzXlzmtApCjkBFpQ9IfX70QSF7CzhMdSmBbjzifsYPqET+8
-						DYhEqXRG7/wKguZAh5SjxA5QqZPxDYAf9ZdAN9hAmLfA9FDjBYhErEXmarGjhSt8
-						I2wU1DJcyCnGSRi1QZNnArFjXtf0dSJXMqbpC0DkGz057DtxAgMBAAGjZTBjMEIG
-						A1UdEQQ7MDmCEWJsb2dzLml0Lm94LmFjLnVrhiRodHRwczovL2Jsb2dzLml0Lm94
-						LmFjLnVrL3NoaWJib2xldGgwHQYDVR0OBBYEFPmPa+TukWsGIl2/RDHAdOc0PqQ9
-						MA0GCSqGSIb3DQEBBQUAA4IBAQAgHD8SRXrO5EDHve1G4gz8j0BCtasDMI+cKpJF
-						Upa3vVWm1BW7FVvmqTRWXWINwb0phOKV1AhV3G2waCRRMnlCE+v/rlzIE79MUf6K
-						8dzME8hVrTz6Xug/IpjJUEc//YrIYHwGfRaT/eORlUNsIoyYfexp6pIh0mY2NGyw
-						yM827XYmiOC22BSY39au2iYWGSlIwxNNLewWZ6q5hoOXT5rz2c832cNW/gqslLde
-						8ml/l/rTR/v08q1mhPSN/EQppYXSBWnoAHW2lFmqC3XSrUqBd9xjU9fWX9ZjHWjQ
-						9bvV+ZPT6CP9dWRJJ0I9Yh50lBOGliCXKs50AqNCD5Qv6DVl
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://blogs.it.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://blogs.it.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://blogs.it.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://blogs.it.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://blogs.it.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://blogs.it.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://blogs.it.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://blogs.it.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://blogs.it.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://blogs.it.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://blogs.it.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://blogs.it.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://blogs.it.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://blogs.it.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://blogs.it.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford: IT Services Blogs</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://blogs.it.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Services Help Centre</GivenName>
-    <EmailAddress>mailto:help@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Systems Development and Support</GivenName>
-    <EmailAddress>mailto:sysdev@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>