Gemfile conflict

2013-04-11 21:14:42 +02:00
parent 3245063a74 5db00e257b
commit 777f06608b
32 changed files with 706 additions and 446 deletions
--- a/2
+++ b/2
@@ -1,6 +1,6 @@
 source "https://rubygems.org"

-# Seg fault in Typhoeus 0.6.3 (and ethon > 0.5.11 with rspec
+# Seg fault in Typhoeus 0.6.3 (and ethon > 0.5.11) with rspec
 gem "typhoeus", "=0.6.2"
 gem "ethon", "=0.5.10"
 gem "nokogiri"