Fixed broken pom

This commit is contained in:
Marcin Grzejszczak
2017-08-21 11:27:06 +02:00
parent 6c9e50df40
commit 1b0cb0a05e
13 changed files with 0 additions and 52 deletions

View File

@@ -5,11 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth</artifactId>
<<<<<<< HEAD
<version>1.3.0.BUILD-SNAPSHOT</version>
=======
<version>1.2.5.BUILD-SNAPSHOT</version>
>>>>>>> 1.2.x
</parent>
<artifactId>spring-cloud-sleuth-docs</artifactId>
<packaging>pom</packaging>