Permalink
Browse files

Bumping mysql2 gem down to see if will work for 1.8.7 and 1.9.2

  • Loading branch information...
1 parent f11138f commit 7d8c7c0890110f99aa8e4fce07029a25132c464f @BrittTheIsh BrittTheIsh committed with drnic Jan 12, 2012
Showing with 4 additions and 0 deletions.
  1. +4 −0 Gemfile.lock
View
@@ -127,6 +127,7 @@ DEPENDENCIES
jruby-openssl
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
mysql2 (~> 0.2.7)
pg (~> 0.13.2)
puma
@@ -135,6 +136,9 @@ DEPENDENCIES
=======
>>>>>>> Testing mysql2 gem again.
mysql2 (~> 0.3.7)
+=======
+ mysql2 (~> 0.2.7)
+>>>>>>> Bumping mysql2 gem down to see if will work for 1.8.7 and 1.9.2
rails (= 3.2.0.rc1)!
rails_autolink
>>>>>>> Testing mysql2

0 comments on commit 7d8c7c0

Please sign in to comment.