Client 2.4

org/parabot/317provider/maven-metadata-local.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata>
-  <groupId>org.parabot</groupId>
-  <artifactId>317provider</artifactId>
-  <versioning>
-    <release>1.0</release>
-    <versions>
-      <version>1.0</version>
-    </versions>
-    <lastUpdated>20150913195548</lastUpdated>
-  </versioning>
-</metadata>

org/parabot/client/2.4/client-2.4.pom

@@ -3,7 +3,7 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.parabot</groupId>
-  <artifactId>317provider</artifactId>
-  <version>1.0</version>
+  <artifactId>client</artifactId>
+  <version>2.4</version>
   <description>POM was created from install:install-file</description>
 </project>

org/parabot/client/maven-metadata-local.xml

@@ -3,25 +3,16 @@
   <groupId>org.parabot</groupId>
   <artifactId>client</artifactId>
   <versioning>
-<<<<<<< HEAD
-    <release>2.2.4</release>
-=======
-    <release>2.2.36</release>
->>>>>>> f4722e25ad51fbbffc6b30603ff6a066ccce9c8f
+    <release>2.4</release>
     <versions>
       <version>2.2</version>
       <version>2.2.32</version>
       <version>2.2.33</version>
       <version>2.2.34</version>
-<<<<<<< HEAD
       <version>2.2.35</version>
       <version>2.2.4</version>
+      <version>2.4</version>
     </versions>
-    <lastUpdated>20150915182915</lastUpdated>
-=======
-      <version>2.2.36</version>
-    </versions>
-    <lastUpdated>20150915064745</lastUpdated>
->>>>>>> f4722e25ad51fbbffc6b30603ff6a066ccce9c8f
+    <lastUpdated>20151004210022</lastUpdated>
   </versioning>
 </metadata>