resolve conflicts and merge

1 files changed, 0 insertions, 74 deletions

diff --git a/swamid-interfederations-1.0/idp.lapinamk.fi.xml b/swamid-interfederations-1.0/idp.lapinamk.fi.xml
deleted file mode 100644
index e1e1e9e7..00000000
--- a/swamid-interfederations-1.0/idp.lapinamk.fi.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.lapinamk.fi/idp/shibboleth">
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">edu.tokem.fi</shibmd:Scope>
-      <shibmd:Scope regexp="false">lapinamk.fi</shibmd:Scope>
-      <shibmd:Scope regexp="false">ramk.fi</shibmd:Scope>
-      <shibmd:Scope regexp="false">tokem.fi</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="fi">Lapin ammattikorkeakoulu</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Lapplands YH</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Lapland UAS</mdui:DisplayName>
-      </mdui:UIInfo>
-      <saml:Attribute Name="tags">
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
-      </saml:Attribute>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEbDCCA1SgAwIBAgIRAPU41ovbqC7No8q/JafFb+0wDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDAxMjMwMDAwMDBaFw0xNzAxMjIyMzU5NTlaMD0xITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEYMBYGA1UEAxMPaWRwLmxhcGlu
-YW1rLmZpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr050+KUHu9a+
-je75uUh/iQCBuoBdOtTRN5NHKK4cRKfM2+0+10zSvCxbcbul0T+yKbiHL5fVVOmm
-T3EZ0M0uInzjgICg63u5HmaF90DjFLpBtaZX/TTaWzvdFODFgqnZabyW/30ea7Zq
-5/8b0NK5Q/klEFYO4TIgkkBVwIlI6pGU/X9V596iEPHfyylR2dEIARviYTeqdQg3
-GVig/DngKBcan11pmEu3mhjVJl+yXRQeGhdeNXC7k8e3XMwEn/L2TEFy909qgHdT
-3Jm2y0g7SHzRoPt4UGJVx0t5dYFRPSEfJcxlP6/B5boU0RpYMa3AjBv7Nnk12+Ww
-vNQAf8Mt3wIDAQABo4IBbDCCAWgwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH
-6pDjue0wHQYDVR0OBBYEFBghh/DvfWtZXDg/l/liGeY0dFwlMA4GA1UdDwEB/wQE
-AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
-AjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAx
-MC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNy
-bDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRl
-cmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2Nz
-cC50Y3MudGVyZW5hLm9yZzAaBgNVHREEEzARgg9pZHAubGFwaW5hbWsuZmkwDQYJ
-KoZIhvcNAQEFBQADggEBACI8smMl17k5l6eOmo1E9yZkF/QasMOd7NaiNT7Cmddt
-nAHtPG7nNFJX+Vj7aOhxZb6Dicp8aPueeswp1tX36PLj4QImXwLs/MoZ0DRUpsAI
-dqBucmey2exV/eIsfLoEOGnoe9aJJHbf1FS/0c4JR7PUfKShp7mYrROKmVZ+N/ya
-ohzJ/hrZTS8lhx46mWsy8WJoZyvV8SSU7SJTblRU1rbjhMIwXWGpAXgq69Oa72IY
-SUNstvZgVwotwKijIBs0iDamz8pzrMKBN1Qft+gzNRC19ijM3S+Ydrx23uBOJz9S
-iBFAJu7GLakQ21kx0iJw7Cvw3dG4QswwoiTV55pAx6g=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lapinamk.fi/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="fi">Lapin amk</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Lapland University of Applied Sciences</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Lapplands Yrkeshögskola</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="fi">Lapin amk</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Lapland University of Applied Sciences</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Lapplands Yrkeshögskola</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="fi">http://www.lapinamk.fi</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.lapinamk.fi</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.lapinamk.fi</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Markku</md:GivenName>
-    <md:SurName>Taipale</md:SurName>
-    <md:EmailAddress>mailto:markku.taipale@lapinamk.fi</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Jukka</md:GivenName>
-    <md:SurName>Heikkila</md:SurName>
-    <md:EmailAddress>mailto:jukka.heikkila@lapinamk.fi</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>