Merge branch 'master' of git://github.com/bigdata-mx/AMQPUtils

Conflicts: pom.xml
bigdata-mx · Jun 1, 2012 · 83af194 · 83af194
2 parents 23d45d8 + c65d603
commit 83af194
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/pom.xml b/pom.xml
@@ -48,7 +48,11 @@
     <dependency>
       <groupId>mx.bigdata.anyobject</groupId>
       <artifactId>anyobject</artifactId>
+<<<<<<< HEAD
       <version>1.0.1-SNAPSHOT</version>
+=======
+      <version>1.0.0</version>
+>>>>>>> c65d6034a15fdccaa4a87f7f1cbffe080ba58adc
     </dependency>
   </dependencies>
   <build>