From e98b7a92b5c8c8fd1cfa6b3a9c30273357a7b3b8 Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <mgrzejszczak@pivotal.io>
Date: Thu, 2 Aug 2018 11:27:50 +0200
Subject: [PATCH] Fixes broken merge

---
 samples/standalone/yml/http-server/pom.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/samples/standalone/yml/http-server/pom.xml b/samples/standalone/yml/http-server/pom.xml
index 72559f6d60..1df451ee2d 100644
--- a/samples/standalone/yml/http-server/pom.xml
+++ b/samples/standalone/yml/http-server/pom.xml
@@ -20,13 +20,8 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.8</java.version>
-<<<<<<< HEAD
 		<spring-cloud-contract.version>2.1.0.BUILD-SNAPSHOT</spring-cloud-contract.version>
 		<spring-cloud-release.version>Finchley.BUILD-SNAPSHOT</spring-cloud-release.version>
-=======
-		<spring-cloud-contract.version>2.0.2.BUILD-SNAPSHOT</spring-cloud-contract.version>
-		<spring-cloud-release.version>Finchley.BUILD-SNAPSHOT</spring-cloud-release.version>
->>>>>>> 2.0.x
 	</properties>
 
 	<dependencies>