From d1fe30e976107b84130fff90edd338441cf860c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Eichst=C3=A4dt-Engelen?=
 <teichsta@users.noreply.github.com>
Date: Mon, 25 May 2015 22:41:04 +0200
Subject: [PATCH] fixed distribution build

---
 distribution/pom.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/distribution/pom.xml b/distribution/pom.xml
index 8e4636e905f..2639b4177cc 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -1185,15 +1185,12 @@
 			<version>${project.version}</version>
 			<type>jar</type>
 		</dependency>
-<<<<<<< HEAD
-=======
 		<dependency>
 			<groupId>org.openhab.binding</groupId>
 			<artifactId>org.openhab.binding.plex</artifactId>
 			<version>${project.version}</version>
 			<type>jar</type>
 		</dependency>
->>>>>>> eb0dba1f76f379fbc96e67d8785e01f8e3aaed0f
 		<dependency>
 			<groupId>org.openhab.binding</groupId>
 			<artifactId>org.openhab.binding.ecobee</artifactId>