prepare for 1.7.0 release

openhab · May 25, 2015 · 49c6e89 · 49c6e89
2 parents c17d39d + eb0dba1
commit 49c6e89
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 133 deletions.
diff --git a/README.txt b/README.txt
diff --git a/distribution/pom.xml b/distribution/pom.xml
@@ -1179,18 +1179,21 @@
 			<version>${project.version}</version>
 			<type>jar</type>
 		</dependency>
-        <dependency>
-            <groupId>org.openhab.binding</groupId>
-            <artifactId>org.openhab.binding.networkupstools</artifactId>
-            <version>${project.version}</version>
-            <type>jar</type>
-        </dependency>
+		<dependency>
+			<groupId>org.openhab.binding</groupId>
+			<artifactId>org.openhab.binding.networkupstools</artifactId>
+			<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>