Resolved merge conflicts

oidc/edu.unl.lstit-door.xml

@@ -17,8 +17,19 @@
         </md:KeyDescriptor>
         <md:NameIDFormat>urn:mace:shibboleth:metadata:oidc:1.0:nameid-format:public</md:NameIDFormat>
         <md:AssertionConsumerService
+<<<<<<< HEAD
                 Binding="https://tools.ietf.org/html/rfc6749#section-3.1.2"
                 Location="https://LSTIT-DOOR.unl.edu/AIUniversal/Account/RegisterExternalLogin.aspx"
                 index="1"/>
+=======
+            Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
+            Location="https://LSTIT-DOOR.unl.edu/AIUniversal/Account/RegisterExternalLogin.aspx"
+            index="1"/>
+
+        <md:AssertionConsumerService
+            Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
+            Location="https://LSTIT-DOORTEST.unl.edu/AIUniversal/Account/RegisterExternalLogin.aspx"
+            index="2"/>
+>>>>>>> 518-update-oidc-metadata-scopes
     </md:SPSSODescriptor>
 </md:EntityDescriptor>