Update build

Author: jjlauer

.blaze/pom.xml

@@ -23,11 +23,7 @@
     <dependency>
       <groupId>com.fizzed</groupId>
       <artifactId>blaze-core</artifactId>
-<<<<<<< HEAD
       <version>2.4.2</version>
-=======
-      <version>2.4.1</version>
->>>>>>> b835750e9a44e23ab1686b4ec1fd1f431622285f
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
@@ -52,11 +48,7 @@
     <dependency>
       <groupId>com.fizzed</groupId>
       <artifactId>blaze-ivy</artifactId>
-<<<<<<< HEAD
       <version>2.4.2</version>
-=======
-      <version>2.4.1</version>
->>>>>>> b835750e9a44e23ab1686b4ec1fd1f431622285f
     </dependency>
     <dependency>
       <groupId>org.apache.ivy</groupId>
@@ -66,48 +58,27 @@
     <dependency>
       <groupId>com.fizzed</groupId>
       <artifactId>blaze-archive</artifactId>
-<<<<<<< HEAD
       <version>2.4.2</version>
-=======
-      <version>2.4.1</version>
->>>>>>> b835750e9a44e23ab1686b4ec1fd1f431622285f
     </dependency>
     <dependency>
       <groupId>com.fizzed</groupId>
       <artifactId>blaze-http</artifactId>
-<<<<<<< HEAD
       <version>2.4.2</version>
-=======
-      <version>2.4.1</version>
     </dependency>
     <dependency>
       <groupId>com.fizzed</groupId>
       <artifactId>blaze-maven</artifactId>
-      <version>2.4.1</version>
->>>>>>> b835750e9a44e23ab1686b4ec1fd1f431622285f
-    </dependency>
-    <dependency>
-      <groupId>com.fizzed</groupId>
-      <artifactId>blaze-ssh</artifactId>
-<<<<<<< HEAD
       <version>2.4.2</version>
     </dependency>
     <dependency>
       <groupId>com.fizzed</groupId>
-      <artifactId>blaze-maven</artifactId>
+      <artifactId>blaze-ssh</artifactId>
       <version>2.4.2</version>
-=======
-      <version>2.4.1</version>
->>>>>>> b835750e9a44e23ab1686b4ec1fd1f431622285f
     </dependency>
     <dependency>
       <groupId>com.fizzed</groupId>
       <artifactId>blaze-public-project</artifactId>
-<<<<<<< HEAD
       <version>3.5.0</version>
-=======
-      <version>3.3.0</version>
->>>>>>> b835750e9a44e23ab1686b4ec1fd1f431622285f
     </dependency>
   </dependencies>
 </project>