Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Testing mysql2

  • Loading branch information...
commit b2d2241ecb6bcea07cfa31a2b9619e38c284788a 1 parent 89b69b9
@BrittTheIsh BrittTheIsh authored drnic committed
Showing with 6 additions and 0 deletions.
  1. +6 −0 Gemfile.lock
View
6 Gemfile.lock
@@ -125,10 +125,16 @@ DEPENDENCIES
jdbc-sqlite3
jquery-rails (= 1.0.14)
jruby-openssl
+<<<<<<< HEAD
mysql2 (~> 0.2.7)
pg (~> 0.13.2)
puma
rails (= 3.0.9)
+=======
+ mysql2 (~> 0.3.7)
+ rails (= 3.2.0.rc1)!
+ rails_autolink
+>>>>>>> Testing mysql2
simple_form (= 1.5.1)
sqlite3
thor
Please sign in to comment.
Something went wrong with that request. Please try again.