Fixed merged conflicted files

2022-04-28 17:26:20 +02:00 · 2022-04-28 17:26:20 +02:00 · b9dc4ec54e
parent 04081a7189
commit b9dc4ec54e
2 changed files with 0 additions and 6 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -2,14 +2,12 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm

 # Changelog for gCube Smartgears Bom

-
 ## [v2.2.0]

 - enhanced gcube-model version range
 - enhanced information-system-model version range
 - Upgraded gcube-bom version to 2.1.0-SNAPSHOT

-
 ## [v2.1.1]

 - Enhanced gcube-bom version
--- a/pom.xml
+++ b/pom.xml
@ -34,11 +34,7 @@
 			<dependency>
 				<groupId>org.gcube.distribution</groupId>
 				<artifactId>gcube-bom</artifactId>
-<<<<<<< HEAD
-				<version>2.0.2</version>
-=======
 				<version>2.1.0</version>
->>>>>>> refs/remotes/origin/feature/22871
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>