Merge branch '2.0.x'

2018-08-01 17:16:13 +02:00
parent 6340bd0eaa ec7ed5e87f
commit 947f4f5399
1 changed files with 5 additions and 0 deletions
--- a/spring-cloud-contract-dependencies/pom.xml
+++ b/spring-cloud-contract-dependencies/pom.xml
@@ -5,8 +5,13 @@
 	<parent>
 		<artifactId>spring-cloud-dependencies-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
+<<<<<<< HEAD
 		<version>2.0.2.BUILD-SNAPSHOT</version>
        <relativePath/>
+=======
+		<version>2.0.4.BUILD-SNAPSHOT</version>
+    <relativePath/>
+>>>>>>> 2.0.x
 	</parent>
 	<artifactId>spring-cloud-contract-dependencies</artifactId>
 	<version>2.1.0.BUILD-SNAPSHOT</version>