Support Configure legacy-API-supplied connection before first use

yahonda · Mar 13, 2024 · fc42a27 · fc42a27
1 parent 7500049
commit fc42a27
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/Gemfile b/Gemfile
@@ -13,7 +13,11 @@ group :development do
   gem "rubocop-rails", require: false
   gem "rubocop-rspec", require: false
 
+<<<<<<< HEAD
   gem "activerecord",   github: "rails/rails", ref: "0e9267767f19065fa513038253179ad6b05c29ab"
+=======
+  gem "activerecord",   github: "rails/rails", ref: "deec3004d8d85443dc4f3f5fd22ab86b10adb58b"
+>>>>>>> de98281a (Support `Configure legacy-API-supplied connection before first use`)
   gem "ruby-plsql", github: "rsim/ruby-plsql", branch: "master"
 
   platforms :ruby do