Merge conflict

kreynolds · Aug 19, 2011 · 1d762f0 · 1d762f0
2 parents 8f6c96e + a63558b
commit 1d762f0
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/cassandra-cql.gemspec b/cassandra-cql.gemspec
@@ -17,6 +17,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency "bundler", ">= 1.0.0"
   s.add_development_dependency "rcov", ">= 0.9.9"
   s.add_development_dependency "rspec", ">= 2.6.0"
+  s.add_development_dependency "rake", ">= 0.9.2"
+  s.add_development_dependency "yard", ">= 0.7.2"
   s.add_dependency "simple_uuid", ">= 0.1.1"
   s.add_dependency "thrift_client", ">= 0.6.3"