fix bad merge

This commit is contained in:
T Jake Luciani 2015-02-20 12:38:28 -05:00
parent ea3ff25a0c
commit 9fdbb6559d
1 changed files with 1 additions and 1 deletions

View File

@ -376,7 +376,7 @@
<dependency groupId="io.netty" artifactId="netty-all" version="4.0.23.Final" />
<dependency groupId="com.google.code.findbugs" artifactId="jsr305" version="2.0.2" />
<dependency groupId="com.clearspring.analytics" artifactId="stream" version="2.5.2" />
<dependency groupId="com.datastax.cassandra" artifactId="cassandra-driver-core" version="2.0.9.2" />
<dependency groupId="com.datastax.cassandra" artifactId="cassandra-driver-core" version="2.1.2" />
<dependency groupId="org.javassist" artifactId="javassist" version="3.18.2-GA" />
<dependency groupId="org.caffinitas.ohc" artifactId="ohc-core" version="0.3.2" />
<dependency groupId="net.sf.supercsv" artifactId="super-csv" version="2.1.0" />