From 6766546ad2d59ad708b04cc5fa96c311c61e67aa Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Fri, 22 Nov 2019 07:30:58 +0100
Subject: merge

---
 swamid-2.0/indico.test.uu.se-shibboleth.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'swamid-2.0/indico.test.uu.se-shibboleth.xml')

diff --git a/swamid-2.0/indico.test.uu.se-shibboleth.xml b/swamid-2.0/indico.test.uu.se-shibboleth.xml
index fc1c606f..b5964456 100644
--- a/swamid-2.0/indico.test.uu.se-shibboleth.xml
+++ b/swamid-2.0/indico.test.uu.se-shibboleth.xml
@@ -103,21 +103,21 @@ acjhlnJDt40YvXKkX07QZm3Ti5EjNpo4xpmj7+U=
       <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="sv">Uppsala universitet</md:OrganizationName>
     <md:OrganizationName xml:lang="en">Uppsala University</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Uppsala universitet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Uppsala University</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="sv">http://www.uu.se/</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">http://www.uu.se/en/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
+  </md:Organization><md:ContactPerson contactType="technical">
     <md:Company>Uppsala universitet</md:Company>
     <md:EmailAddress>mailto:drift@uadm.uu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+  </md:ContactPerson><md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
     <md:GivenName>Uppsala University Computer Security Incident Response Team</md:GivenName>
     <md:EmailAddress>mailto:security@uu.se</md:EmailAddress>
     <md:TelephoneNumber>+46-18-4717560</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
-- 
cgit v1.2.3