From 16c162c64d0bd7d85ddfb728e1d2fcea8ece8bdc Mon Sep 17 00:00:00 2001
From: Andrew Costa <andrew.costa@nebraska.edu>
Date: Fri, 26 Jan 2024 15:31:21 -0600
Subject: [PATCH] fixed merge conflicts part 2
---
nefed.xml | 3 ---
1 file changed, 3 deletions(-)
diff --git a/nefed.xml b/nefed.xml
index d638588..4a6f714 100644
--- a/nefed.xml
+++ b/nefed.xml
@@ -29102,7 +29102,6 @@ Gk3Mp05d1eUmuSx+la30QAXkFgNXDP3Cp3JSKyG5A6EWjhXTyuNZcI/ffo6tjNWg
<OrganizationDisplayName xml:lang="en">NSWERS Insights+</OrganizationDisplayName>
<OrganizationURL xml:lang="en">https://nswers.org/</OrganizationURL>
</Organization>
-<<<<<<< HEAD
<ContactPerson contactType="technical">
<GivenName>David Hefley</GivenName>
<EmailAddress>davidhefley@nebraska.edu</EmailAddress>
@@ -29120,8 +29119,6 @@ Gk3Mp05d1eUmuSx+la30QAXkFgNXDP3Cp3JSKyG5A6EWjhXTyuNZcI/ffo6tjNWg
<GivenName>ITS Security</GivenName>
<EmailAddress>security@nebraska.edu</EmailAddress>
</ContactPerson>
-=======
->>>>>>> master
</EntityDescriptor>
<EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
--
GitLab