Permalink
Browse files

Testing mysql2 gem again.

  • Loading branch information...
1 parent b2d2241 commit f11138f681c0c06e216a508dfee9c0ac61b1c6ea @BrittTheIsh BrittTheIsh committed with drnic Jan 11, 2012
Showing with 3 additions and 0 deletions.
  1. +3 −0 Gemfile.lock
View
@@ -125,12 +125,15 @@ DEPENDENCIES
jdbc-sqlite3
jquery-rails (= 1.0.14)
jruby-openssl
+<<<<<<< HEAD
<<<<<<< HEAD
mysql2 (~> 0.2.7)
pg (~> 0.13.2)
puma
rails (= 3.0.9)
=======
+=======
+>>>>>>> Testing mysql2 gem again.
mysql2 (~> 0.3.7)
rails (= 3.2.0.rc1)!
rails_autolink

0 comments on commit f11138f

Please sign in to comment.