This commit is contained in:
Marcin Grzejszczak
2018-01-19 09:55:50 +01:00
parent 643cbb2938
commit ed9dfd223f

View File

@@ -20,13 +20,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<<<<<<< HEAD
<spring-cloud-contract.version>2.0.0.BUILD-SNAPSHOT</spring-cloud-contract.version>
<spring-cloud-dependencies.version>Finchley.BUILD-SNAPSHOT</spring-cloud-dependencies.version>
=======
<spring-cloud-contract.version>1.2.3.BUILD-SNAPSHOT</spring-cloud-contract.version>
<spring-cloud-dependencies.version>Edgware.BUILD-SNAPSHOT</spring-cloud-dependencies.version>
>>>>>>> 1.2.x
</properties>
<dependencies>