[spring-extensions] 05/05: Fix merge conflict.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch dev/JSPS-1
in repository spring-extensions.

View the commit online:
http://git.shibboleth.net/view/?p=spring-extensions.git;a=commit;h=0ec02251575cdde8db5ef1a8087f9b6f2166e98d

commit 0ec02251575cdde8db5ef1a8087f9b6f2166e98d
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Jun 2 10:39:17 2022 -0400

    Fix merge conflict.
---
 pom.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index cbf1eb1..3798e89 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,11 +26,7 @@
 
     <properties>
         <automatic.module.name>net.shibboleth.ext.spring</automatic.module.name>
-<<<<<<< Upstream, based on origin/main
         <java-support.version>9.0.0-SNAPSHOT</java-support.version>
-=======
-        <java-support.version>8.3.2-SNAPSHOT</java-support.version>
->>>>>>> bb5853e Migrate some IdP code down.
         <shibboleth.site.deploy.url>//shibboleth.net/home/javasites/staging/</shibboleth.site.deploy.url>
     </properties>
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.