Testing mysql2 gem again.

engineyard · Sep 19, 2012 · f11138f · f11138f
1 parent b2d2241
commit f11138f
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -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