use snapshot

Author: tamasblummer

api/pom.xml

@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>com.bitsofproof</groupId>
 		<artifactId>supernode</artifactId>
-		<version>2.0.3</version>
+		<version>2.0.4-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 

pom.xml

@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.bitsofproof</groupId>
 	<artifactId>supernode</artifactId>
-	<version>2.0.3</version>
+	<version>2.0.4-SNAPSHOT</version>
 	<name>supernode</name>
 	<description>The bitsofproof supernode implementation of the Bitcoin protocol</description>
 	<packaging>pom</packaging>
@@ -70,11 +70,7 @@
 		<connection>scm:git:git@github.com:bitsofproof/supernode.git</connection>
 	    <developerConnection>scm:git:git@github.com:bitsofproof/supernode.git</developerConnection>
 		<url>https://github.com/bitsofproof/supernode</url>
-<<<<<<< HEAD
-		<tag>2.0.3</tag>
-=======
-		<tag>2.0.1</tag>
->>>>>>> 820ac10a7d837998443bf0e206e04cf119a988cd
+		<tag>HEAD</tag>
 	</scm>
 
 	<pluginRepositories>

server/pom.xml

@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>com.bitsofproof</groupId>
 		<artifactId>supernode</artifactId>
-		<version>2.0.3</version>
+		<version>2.0.4-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<properties>