Fixed broken pom
This commit is contained in:
@@ -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>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user