Fixes #19180: Broken pom after merge

Normation · Apr 23, 2021 · 2d03ece · 2d03ece
1 parent b00264d
commit 2d03ece
Showing 1 changed file with 1 addition and 11 deletions.
diff --git a/webapp/sources/pom.xml b/webapp/sources/pom.xml
@@ -18,11 +18,7 @@ limitations under the License.
 
   <groupId>com.normation</groupId>
   <artifactId>parent-pom</artifactId>
-<<<<<<< HEAD
   <version>7.0.0~alpha1-SNAPSHOT</version>
-=======
-  <version>6.2.7-SNAPSHOT</version>
->>>>>>> branches/rudder/6.2
   <packaging>pom</packaging>
 
   <!-- ====================================  PROJECT INFORMATION  ==================================== -->
@@ -357,15 +353,9 @@ limitations under the License.
 
     <!-- Libraries version that MUST be used in all children project -->
 
-<<<<<<< HEAD
-    <current-year>2020</current-year>
+    <current-year>2021</current-year>
     <rudder-major-version>7.0</rudder-major-version>
     <rudder-version>7.0.0~alpha1-SNAPSHOT</rudder-version>
-=======
-    <current-year>2021</current-year>
-    <rudder-major-version>6.2</rudder-major-version>
-    <rudder-version>6.2.7-SNAPSHOT</rudder-version>
->>>>>>> branches/rudder/6.2
 
     <scala-version>2.13.3</scala-version>
     <scala-binary-version>2.13</scala-binary-version>