SpringCloud/spring-cloud-kubernetes
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix merge conflict

Browse Source
This commit is contained in:
Haytham Mohamed
2019-09-18 18:07:33 -05:00
parent 2c91618f65
commit 46d8450e96
2 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-cloud-kubernetes-examples/kubernetes-circuitbreaker-ribbon-example/name-service/pom.xml
View File

@@ -23,11 +23,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>kubernetes-circuitbreaker-ribbon-example</artifactId>
<<<<<<< HEAD
<version>1.1.0.BUILD-SNAPSHOT</version>
=======
<version>1.0.4.BUILD-SNAPSHOT</version>
>>>>>>> 1.0.x
</parent>
<artifactId>name-service</artifactId>

4
spring-cloud-kubernetes-integration-tests/istio/pom.xml
View File

@@ -7,11 +7,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
<<<<<<< HEAD
<version>1.1.0.BUILD-SNAPSHOT</version>
=======
<version>1.0.4.BUILD-SNAPSHOT</version>
>>>>>>> 1.0.x
</parent>
<name>Spring Cloud Kubernetes :: Integration Tests :: Istio</name>