fixed distribution build

openhab · May 25, 2015 · d1fe30e · d1fe30e
1 parent 49c6e89
commit d1fe30e
Showing 1 changed file with 0 additions and 3 deletions.
diff --git 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>