resolve conflicts and merge

1 files changed, 29 insertions, 29 deletions

diff --git a/swamid-interfederations-2.0/www.nordbiomed.net-saml-sp.xml b/swamid-interfederations-2.0/www.nordbiomed.net-saml-sp.xml
index 5746c2f4..ccb9ad2a 100644
--- a/swamid-interfederations-2.0/www.nordbiomed.net-saml-sp.xml
+++ b/swamid-interfederations-2.0/www.nordbiomed.net-saml-sp.xml
@@ -11,43 +11,43 @@
         <mdui:DisplayName xml:lang="fi">Nordbiomed.net Moodle</mdui:DisplayName>
         <mdui:DisplayName xml:lang="sv">Nordbiomed.net Moodle</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Nordbiomed.net Moodle</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Moodle webkurser om biomedicin för studenter på Nordbiomed programmet.</mdui:Description>
         <mdui:Description xml:lang="fi">Biolääketieteen Moodle verkkokursseja Nordbiomed ohjelman opiskelijoille</mdui:Description>
         <mdui:Description xml:lang="en">Biomedicine online courses for Nordbiomed students in Moodle</mdui:Description>
-        <mdui:Description xml:lang="sv">Moodle webkurser om biomedicin för studenter på Nordbiomed programmet.</mdui:Description>
-        <mdui:PrivacyStatementURL xml:lang="fi">http://www.mcampus.fi/rekisteriseloste_mmg.pdf</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="en">http://www.mcampus.fi/Moodle_rekisteriseloste_EN.pdf</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="fi">http://www.mcampus.fi/rekisteriseloste_mmg.pdf</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
-          <ds:X509Certificate>MIIE4zCCA8ugAwIBAgIRANbySfQqDQ9zZ4V2aSBw+r4wDQYJKoZIhvcNAQEFBQAw
-QTELMAkGA1UEBhMCRlIxEjAQBgNVBAoTCUdBTkRJIFNBUzEeMBwGA1UEAxMVR2Fu
-ZGkgU3RhbmRhcmQgU1NMIENBMB4XDTE0MDgwODAwMDAwMFoXDTE1MDgwODIzNTk1
-OVowWTEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQL
-ExJHYW5kaSBTdGFuZGFyZCBTU0wxFzAVBgNVBAMTDm5vcmRiaW9tZWQubmV0MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsLoUtGc7MKdSOLEwoAY58MFq
-SPgKPpQlfqeDbE18ivhw96/wS7OYWLyMUBM4Wj2fnoXHXDxMF2MQhusRJjfXmzw8
-md0YBoylbajo14cCaen6PjZdD8m9b0KsqtQy8yqa/KWVMuUoM2vonOtBpsML4mP6
-NVhNU0imUDMsfAgnaoG2EfAA190FVX9oybDUaLbK7P9finunX0/mwxfxKYf45klw
-VDDym6rRBuLBOUSD+RAD4LSZ8WbQNC0XyHTk/pgD4odrT3S8knq24Y0SVTJOADW4
-e5lPX2G8Vn0vJXL1MAZdRotM4VY5fvAf76zDD77jca3i6b0qTYFOgYMytL5/5QID
-AQABo4IBvDCCAbgwHwYDVR0jBBgwFoAUtqj/oqgv0KbNS7Fo8+dQEDGneSEwHQYD
-VR0OBBYEFFSU9LIZC5KU6sNdN/eiXnguhT/8MA4GA1UdDwEB/wQEAwIFoDAMBgNV
-HRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBgBgNVHSAE
-WTBXMEsGCysGAQQBsjEBAgIaMDwwOgYIKwYBBQUHAgEWLmh0dHA6Ly93d3cuZ2Fu
-ZGkubmV0L2NvbnRyYWN0cy9mci9zc2wvY3BzL3BkZi8wCAYGZ4EMAQIBMDwGA1Ud
-HwQ1MDMwMaAvoC2GK2h0dHA6Ly9jcmwuZ2FuZGkubmV0L0dhbmRpU3RhbmRhcmRT
-U0xDQS5jcmwwagYIKwYBBQUHAQEEXjBcMDcGCCsGAQUFBzAChitodHRwOi8vY3J0
-LmdhbmRpLm5ldC9HYW5kaVN0YW5kYXJkU1NMQ0EuY3J0MCEGCCsGAQUFBzABhhVo
-dHRwOi8vb2NzcC5nYW5kaS5uZXQwLQYDVR0RBCYwJIIObm9yZGJpb21lZC5uZXSC
-End3dy5ub3JkYmlvbWVkLm5ldDANBgkqhkiG9w0BAQUFAAOCAQEADkQ7NDW2rUCc
-1duYsOiBOhzx9DFikpR7ceBqbWicfQPkPNkdeRMeSGyrc1/Laz+1vzmERnD2wNHk
-EwzIvfsGCF8gfELl+Gcef8CzLu8ilEHb+z2hjW1BsBYG6+TlfS1voekeVt8YfBvh
-WkbjgWGxjz+32+RnjiQsFG/acxbLDKAV3iuVMIQY5q9k7yppb+FnwyMOPVoJLDPY
-ZTMTNtz5xmKVfCHGSiyCrKPrHIk5s4JFDyfdLEjuW4oSBB4KM+Ztrkq1hSuE3s9y
-zsy1QQZKFOddPJgZM7PyUaFBCktdndZBXTYoRVTvhrCLr65Sqea89rshZnDa/umD
-CAKgw6g9qQ==</ds:X509Certificate>
+          <ds:X509Certificate>MIIE/TCCA+WgAwIBAgIQTEIjMmXuufcFuvtWfJihPTANBgkqhkiG9w0BAQsFADBf
+MQswCQYDVQQGEwJGUjEOMAwGA1UECBMFUGFyaXMxDjAMBgNVBAcTBVBhcmlzMQ4w
+DAYDVQQKEwVHYW5kaTEgMB4GA1UEAxMXR2FuZGkgU3RhbmRhcmQgU1NMIENBIDIw
+HhcNMTUwNzE3MDAwMDAwWhcNMTYwODA4MjM1OTU5WjBdMSEwHwYDVQQLExhEb21h
+aW4gQ29udHJvbCBWYWxpZGF0ZWQxGzAZBgNVBAsTEkdhbmRpIFN0YW5kYXJkIFNT
+TDEbMBkGA1UEAxMSd3d3Lm5vcmRiaW9tZWQubmV0MIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAls+xz8egoxxjFCKfIDzdVZHScL48GtfWfBAZafwuIJho
+dTmsbv9N5kbIm1uLh0GH+IuhEoJruOteMTe1m745IE9AoCluQPWzIfVaUjlc74YW
+QwJLHgaw6ZrzCA0ohP5SLHCOPJDv+1xAzlAumHmnsOw4mX7ea10Plot3SqMcO6rI
+zepln15pqPmmuo57X1jkpQREAKW59DqU5h2RecI56mdIgya3doPQxU3+C9dOMdDT
+z9tnp22IgGRnT1gkF8Ydi4QYFK0KDgLXoLWyuZt0V8N/OAjIGI0eEOjzdPup26k3
+WOvq70FzGpduv4FVPVu+fJjG7ifF0UZUh45yAQO2yQIDAQABo4IBtTCCAbEwHwYD
+VR0jBBgwFoAUs5Cn2MmvTs1hPJ98rV1/Qf1pMOowHQYDVR0OBBYEFCvesVl+fDPe
+JpcyFyNxkZ1Pew81MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1Ud
+JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBLBgNVHSAERDBCMDYGCysGAQQBsjEB
+AgIaMCcwJQYIKwYBBQUHAgEWGWh0dHBzOi8vY3BzLnVzZXJ0cnVzdC5jb20wCAYG
+Z4EMAQIBMEEGA1UdHwQ6MDgwNqA0oDKGMGh0dHA6Ly9jcmwudXNlcnRydXN0LmNv
+bS9HYW5kaVN0YW5kYXJkU1NMQ0EyLmNybDBzBggrBgEFBQcBAQRnMGUwPAYIKwYB
+BQUHMAKGMGh0dHA6Ly9jcnQudXNlcnRydXN0LmNvbS9HYW5kaVN0YW5kYXJkU1NM
+Q0EyLmNydDAlBggrBgEFBQcwAYYZaHR0cDovL29jc3AudXNlcnRydXN0LmNvbTAt
+BgNVHREEJjAkghJ3d3cubm9yZGJpb21lZC5uZXSCDm5vcmRiaW9tZWQubmV0MA0G
+CSqGSIb3DQEBCwUAA4IBAQCODf9haiwN3O9XzB9V4MBPPcB0661YbNJo2N6rguEk
+v9JbToStcACbQ3V0xb2yulk/rgw50U7Qd8nJ7FJg60UfXJsPJbhY82JBK2cXBsUR
+aoxFqzTcOzeHsZzkHWCetMuJ3C2U7zJ7zlM5d00CKq4KUMPw4aIWa1ZVZzY6w7fk
+ygsKkxkMt53Bgz+kboZ2Za7f8+mI1WSwOXGZ7JZvA1silbYaWqAOP/Q2p0YTonc/
+cb9svLVNv1dY7g+DHfHECFu9SLjl/htYmWWoUtL/59m+nPGPmDL6I/rjdzGtVGXi
+PbMcpBprCNt05806/04coPb2RbK0VDV5DG00Z/kNoGxR</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>