Resolved merge conflict

CHANGELOG.md

@@ -1,19 +1,5 @@
 # Changelog for storage-manager-core
 
-<<<<<<< HEAD
-## [v3.1.0-SNAPSHOT]
-  * upgrade mongo-java-client to version 3.12.0
-  * removed close method for mongo client. Now the connection pool is managed by java driver
-  * deprecated getUrl method
-
-
-## [v3.0.1-SNAPSHOT]
-  * deprecated Http methods used for returning http url
-
-## [v3.0.0-SNAPSHOT]
-  * added token and region parameters in order to be compliant with s3 object storage
-  * refactoring code
-=======
 ## [v2.12.1-SNAPSHOT
   * add check on transport layer instance: if the memory type is not the same, a new transportLayer is instatiated
   * move memoryType var from super class TransportManager
@@ -24,7 +10,6 @@
 
 ## [v2.10.0-SNAPSHOT]
   * upgrade mongo-java-driver to 3.12.0
->>>>>>> bug21078
 
 ## [v2.10.0-SNAPSHOT]
   * added input parameter to getSize method in order to be compatible with the needed of s3 client

pom.xml

@@ -8,17 +8,10 @@
 	</parent>
   <groupId>org.gcube.contentmanagement</groupId>
   <artifactId>storage-manager-core</artifactId>
-<<<<<<< HEAD
-  <version>2.9.0-SNAPSHOT</version>
-  <properties>
-  		<distroDirectory>${project.basedir}/distro</distroDirectory>
-  </properties>
-=======
   <version>2.12.1-SNAPSHOT</version>
 <!--   <properties> -->
 <!--   		<distroDirectory>${project.basedir}/distro</distroDirectory> -->
 <!--   </properties> -->
->>>>>>> bug21078
   <scm>
 		<connection>scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git</connection>
 		<developerConnection>scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git</developerConnection>
@@ -61,8 +54,6 @@
 			<version>1.8</version>
 		</dependency>
   </dependencies>
-<<<<<<< HEAD
-=======
 <!--   <build> -->
 <!-- 		<plugins> -->
 <!-- 			<plugin> -->
@@ -112,5 +103,4 @@
 <!-- 				</plugin> -->
 <!-- 		</plugins> -->
 <!-- 	</build> -->
->>>>>>> bug21078
 </project>