Fixed merged conflicted files
This commit is contained in:
parent
04081a7189
commit
b9dc4ec54e
|
@ -2,14 +2,12 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
|
||||||
|
|
||||||
# Changelog for gCube Smartgears Bom
|
# Changelog for gCube Smartgears Bom
|
||||||
|
|
||||||
|
|
||||||
## [v2.2.0]
|
## [v2.2.0]
|
||||||
|
|
||||||
- enhanced gcube-model version range
|
- enhanced gcube-model version range
|
||||||
- enhanced information-system-model version range
|
- enhanced information-system-model version range
|
||||||
- Upgraded gcube-bom version to 2.1.0-SNAPSHOT
|
- Upgraded gcube-bom version to 2.1.0-SNAPSHOT
|
||||||
|
|
||||||
|
|
||||||
## [v2.1.1]
|
## [v2.1.1]
|
||||||
|
|
||||||
- Enhanced gcube-bom version
|
- Enhanced gcube-bom version
|
||||||
|
|
4
pom.xml
4
pom.xml
|
@ -34,11 +34,7 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.gcube.distribution</groupId>
|
<groupId>org.gcube.distribution</groupId>
|
||||||
<artifactId>gcube-bom</artifactId>
|
<artifactId>gcube-bom</artifactId>
|
||||||
<<<<<<< HEAD
|
|
||||||
<version>2.0.2</version>
|
|
||||||
=======
|
|
||||||
<version>2.1.0</version>
|
<version>2.1.0</version>
|
||||||
>>>>>>> refs/remotes/origin/feature/22871
|
|
||||||
<type>pom</type>
|
<type>pom</type>
|
||||||
<scope>import</scope>
|
<scope>import</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
Loading…
Reference in New Issue