From b93e86e7a888b70ed539ef1a79a05cec1520d7d5 Mon Sep 17 00:00:00 2001
From: Roberto Cirillo <roberto.cirillo@isti.cnr.it>
Date: Fri, 5 Apr 2024 15:22:51 +0200
Subject: [PATCH] Update 'pom.xml'

fix conflict
---
 pom.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index cb2ad7e..db05768 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,7 +78,8 @@
                 <javadoc.opts>-Xdoclint:none</javadoc.opts>
             </properties>
         </profile>
-        <!--profile set-local-classpath commented see #26841>
+	    <!--profile set-local-classpath commented see #26841-->
+        <!--profile>
             <id>set-local-classpath</id>
             <activation>
                 <jdk>[1.8,)</jdk>
@@ -90,7 +91,7 @@
 					</resource>
 				</resources>
 			</build>
-        </profile-->        
+        </profile-->               
         <profile>
             <id>generate-distribution-packages</id>
             <activation>