From ed9dfd223f06be94a28ac6ea8d8860bca6f02c7e Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <mgrzejszczak@pivotal.io>
Date: Fri, 19 Jan 2018 09:55:50 +0100
Subject: [PATCH] :facepalm:

---
 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 a04f512924..e3f3336c07 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.0.0.BUILD-SNAPSHOT</spring-cloud-contract.version>
 		<spring-cloud-dependencies.version>Finchley.BUILD-SNAPSHOT</spring-cloud-dependencies.version>
-=======
-		<spring-cloud-contract.version>1.2.3.BUILD-SNAPSHOT</spring-cloud-contract.version>
-		<spring-cloud-dependencies.version>Edgware.BUILD-SNAPSHOT</spring-cloud-dependencies.version>
->>>>>>> 1.2.x
 	</properties>
 
 	<dependencies>