Merge branch 'master' of github.com:bcg/em-mongo

Conflicts: Rakefile spec/gem/rubygems.rb
bcg · Nov 30, 2010 · 4766f97 · 4766f97
2 parents be7f8de + 7d17a6a
commit 4766f97
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/Rakefile b/Rakefile
@@ -79,7 +79,11 @@ namespace :spec do
         print "Testing Rubygems integration ... "
         steps =[]
         steps << "cd spec/gem"
+<<<<<<< HEAD
         steps << "gem uninstall -a em-mongo >/dev/null"
+=======
+        steps << "gem uninstall em-mongo >/dev/null"
+>>>>>>> 7d17a6a3967a7f135f29bed82b224e1959312655
         steps << "gem install #{root_dir}/em-mongo-#{em_mongo_version}.gem >/dev/null"
         steps << "./rubygems.rb"
         if system steps.join(" && ")