Fix merge issues with pom.xml

cf-toolsuite · Jan 16, 2025 · f359a3a · f359a3a
1 parent cdf3581
commit f359a3a
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -71,11 +71,7 @@
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<maven.compiler.source>${java.version}</maven.compiler.source>
 		<maven.compiler.target>${java.version}</maven.compiler.target>
-<<<<<<< Updated upstream
-		<vaadin.version>24.6.1</vaadin.version>
-=======
 		<vaadin.version>24.6.2</vaadin.version>
->>>>>>> Stashed changes
 	</properties>
 
 	<dependencies>