<<<<<<< HEAD 4.0.0 org.apollo 1.0 apollo src test org.apache.maven.plugins maven-compiler-plugin 2.5.1 1.7 1.7 org.apache.commons commons-compress 1.7 org.jruby jruby-complete 1.7.10 com.google.guava guava 16.0 io.netty netty-all 4.0.15.Final compile ======= 4.0.0 org.apollo 1.0.0-SNAPSHOT apollo src test org.apache.commons commons-compress 1.7 org.jruby jruby-complete 1.7.10 com.google.guava guava 16.0 io.netty netty-all 4.0.15.Final compile >>>>>>> 86a477d2133d3cab6d6d9983e1bb939db088db39