From 07b2ea84983d757b346a4c45e759aeee3267e6ea Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Wed, 20 Nov 2019 08:35:28 +0100
Subject: merge

---
 swamid-2.0/login2.temp1235.hhs.se-idp-shibboleth.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'swamid-2.0/login2.temp1235.hhs.se-idp-shibboleth.xml')

diff --git a/swamid-2.0/login2.temp1235.hhs.se-idp-shibboleth.xml b/swamid-2.0/login2.temp1235.hhs.se-idp-shibboleth.xml
index 48d2be56..9ea0d36f 100644
--- a/swamid-2.0/login2.temp1235.hhs.se-idp-shibboleth.xml
+++ b/swamid-2.0/login2.temp1235.hhs.se-idp-shibboleth.xml
@@ -187,7 +187,10 @@ ZVOgTNDyMvfjJy54qOW28X+xRFZ9JpVo1SCBY/VyM1qJsOvFesw18dJORMU444BX
     <!-- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login2.temp1235.hhs.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/> -->
     <!-- If you uncomment the above you should add urn:oasis:names:tc:SAML:2.0:protocol to the protocolSupportEnumeration above -->
   </AttributeAuthorityDescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+  
+  
+  
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
     <OrganizationName xml:lang="en">
          Stockholm School of Economics
       </OrganizationName>
@@ -206,11 +209,8 @@ ZVOgTNDyMvfjJy54qOW28X+xRFZ9JpVo1SCBY/VyM1qJsOvFesw18dJORMU444BX
     <OrganizationURL xml:lang="sv">
          https://www.hhs.se/sv/
       </OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+  </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <EmailAddress>mailto:gregor.borgstrand@hhs.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+  </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
     <EmailAddress>mailto:itsupport@hhs.se</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
-- 
cgit v1.2.3