Fixed wrong merging

2016-01-14 14:20:56 +01:00
parent 779b32b363
commit bf191d7cba
6 changed files with 44 additions and 82 deletions
--- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/pom.xml
+++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/pom.xml
@@ -86,6 +86,11 @@
 			<groupId>io.zipkin</groupId>
 			<artifactId>zipkin-java-server</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>com.github.kristofa</groupId>
+			<artifactId>brave-core</artifactId>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>

 </project>