Fixed corrupt merge

2018-08-02 10:58:28 +02:00
parent 947f4f5399
commit 933afbe564
1 changed files with 1 additions and 6 deletions
--- a/spring-cloud-contract-dependencies/pom.xml
+++ b/spring-cloud-contract-dependencies/pom.xml
@@ -5,13 +5,8 @@
 	<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
+        <relativePath/>
 	</parent>
 	<artifactId>spring-cloud-contract-dependencies</artifactId>
 	<version>2.1.0.BUILD-SNAPSHOT</version>