Fixed broken pom

2017-08-21 11:27:06 +02:00
parent 6c9e50df40
commit 1b0cb0a05e
13 changed files with 0 additions and 52 deletions
--- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-websocket/pom.xml
+++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-websocket/pom.xml
@@ -28,11 +28,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-samples</artifactId>
-<<<<<<< HEAD
 		<version>1.3.0.BUILD-SNAPSHOT</version>
-=======
-		<version>1.2.5.BUILD-SNAPSHOT</version>
->>>>>>> 1.2.x
 		<relativePath>..</relativePath>
 	</parent>