Resolve "Install new cert for Shibboleth connection with UNO Mavpark"

Modify metadata to get new UNO Parking metadata into nefed.

nefed.xml

@@ -27150,7 +27150,6 @@
             <EmailAddress>security@nebraska.edu</EmailAddress>
         </ContactPerson>
     </EntityDescriptor>
-<<<<<<< HEAD
     <EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_0aca74246bf5d5f437a4b687392ac0c8b5b5bc24" entityID="unoparking.t2hosted.com">
         <Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
             <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512" />
@@ -27312,7 +27311,6 @@
             <EmailAddress>security@nebraska.edu</EmailAddress>
         </ContactPerson>
     </EntityDescriptor>
-=======
  <EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_73ae8a9ad3cfab7d10047bf1a92c12f2282a1af8" entityID="https://unlpts.t2hosted.com/UNLPTS/Shibboleth.sso">
     <Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
@@ -27473,6 +27471,5 @@
         <EmailAddress>security@nebraska.edu</EmailAddress>
     </ContactPerson>
 </EntityDescriptor>
->>>>>>> master
 </EntitiesDescriptor>
\ No newline at end of file