Merge is fixed

Author: solomax

pom.xml

@@ -272,11 +272,7 @@
 		<hibernate-ehcache.version>6.0.0.Alpha7</hibernate-ehcache.version>
 		<hibernate-validator.version>8.0.1.Final</hibernate-validator.version>
 		<javassist.version>3.30.2-GA</javassist.version>
-<<<<<<< Updated upstream
-		<jetty.version>11.0.14</jetty.version>
-=======
 		<jetty.version>11.0.20</jetty.version>
->>>>>>> Stashed changes
 		<sf-jung.version>2.1.1</sf-jung.version>
 		<shiro.version>1.11.0</shiro.version>
 		<slf4j.version>2.0.7</slf4j.version>
@@ -293,10 +289,7 @@
 		<jquery-selectors.version>4.0.2</jquery-selectors.version>
 		<xstream.version>1.4.20</xstream.version>
 		<hamcrest.version>2.2</hamcrest.version>
-<<<<<<< Updated upstream
 		<commons-logging.version>1.3.0</commons-logging.version>
-=======
->>>>>>> Stashed changes
 		<jakarta.servlet-api.version>6.0.0</jakarta.servlet-api.version>
 		<junit.version>5.10.2</junit.version>
 		<easymock.version>5.2.0</easymock.version>