Merge branch '1.2.x'

2017-08-21 10:16:03 +02:00
parent 3931087628 17df781524
commit 6c9e50df40
13 changed files with 52 additions and 0 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,7 +28,11 @@
 	<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>