From 46d8450e964c1e094a10f30a67d99e1fbc30f74c Mon Sep 17 00:00:00 2001
From: Haytham Mohamed <haybu@hotmail.com>
Date: Wed, 18 Sep 2019 18:07:33 -0500
Subject: [PATCH] fix merge conflict

---
 .../name-service/pom.xml                                      | 4 ----
 spring-cloud-kubernetes-integration-tests/istio/pom.xml       | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/spring-cloud-kubernetes-examples/kubernetes-circuitbreaker-ribbon-example/name-service/pom.xml b/spring-cloud-kubernetes-examples/kubernetes-circuitbreaker-ribbon-example/name-service/pom.xml
index e9664487..5a6c016b 100644
--- a/spring-cloud-kubernetes-examples/kubernetes-circuitbreaker-ribbon-example/name-service/pom.xml
+++ b/spring-cloud-kubernetes-examples/kubernetes-circuitbreaker-ribbon-example/name-service/pom.xml
@@ -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>
diff --git a/spring-cloud-kubernetes-integration-tests/istio/pom.xml b/spring-cloud-kubernetes-integration-tests/istio/pom.xml
index 23eed650..ab274ab1 100644
--- a/spring-cloud-kubernetes-integration-tests/istio/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/istio/pom.xml
@@ -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>