From b9dc4ec54ea587c5f7722d821f7f16a9283d01f6 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Thu, 28 Apr 2022 17:26:20 +0200 Subject: [PATCH] Fixed merged conflicted files --- CHANGELOG.md | 2 -- pom.xml | 4 ---- 2 files changed, 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 857a5df..5ca928b 100644 --- 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 diff --git a/pom.xml b/pom.xml index c3bf714..3fd04de 100644 --- a/pom.xml +++ b/pom.xml @@ -34,11 +34,7 @@ org.gcube.distribution gcube-bom -<<<<<<< HEAD - 2.0.2 -======= 2.1.0 ->>>>>>> refs/remotes/origin/feature/22871 pom import