Skip to content
Snippets Groups Projects
Commit 51a5d2d7 authored by andrew.costa's avatar andrew.costa
Browse files

fixed merge conflicts

parents e61ed116 588e921a
No related branches found
No related tags found
1 merge request!476Resolve "Update Support Contact for NSWERS"
Show whitespace changes
Inline Side-by-side
Showing
with 3 additions and 0 deletions
nefed.xml
+ 3
− 0
View file @ 51a5d2d7
...@@ -29102,6 +29102,7 @@ Gk3Mp05d1eUmuSx+la30QAXkFgNXDP3Cp3JSKyG5A6EWjhXTyuNZcI/ffo6tjNWg ...@@ -29102,6 +29102,7 @@ Gk3Mp05d1eUmuSx+la30QAXkFgNXDP3Cp3JSKyG5A6EWjhXTyuNZcI/ffo6tjNWg
<OrganizationDisplayName xml:lang="en">NSWERS Insights+</OrganizationDisplayName> <OrganizationDisplayName xml:lang="en">NSWERS Insights+</OrganizationDisplayName>
<OrganizationURL xml:lang="en">https://nswers.org/</OrganizationURL> <OrganizationURL xml:lang="en">https://nswers.org/</OrganizationURL>
</Organization> </Organization>
<<<<<<< HEAD
<ContactPerson contactType="technical"> <ContactPerson contactType="technical">
<GivenName>David Hefley</GivenName> <GivenName>David Hefley</GivenName>
<EmailAddress>davidhefley@nebraska.edu</EmailAddress> <EmailAddress>davidhefley@nebraska.edu</EmailAddress>
...@@ -29119,6 +29120,8 @@ Gk3Mp05d1eUmuSx+la30QAXkFgNXDP3Cp3JSKyG5A6EWjhXTyuNZcI/ffo6tjNWg ...@@ -29119,6 +29120,8 @@ Gk3Mp05d1eUmuSx+la30QAXkFgNXDP3Cp3JSKyG5A6EWjhXTyuNZcI/ffo6tjNWg
<GivenName>ITS Security</GivenName> <GivenName>ITS Security</GivenName>
<EmailAddress>security@nebraska.edu</EmailAddress> <EmailAddress>security@nebraska.edu</EmailAddress>
</ContactPerson> </ContactPerson>
=======
>>>>>>> master
</EntityDescriptor> </EntityDescriptor>
<EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" <EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment