diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2014-01-04 09:30:01 +0000 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2014-01-04 09:30:01 +0000 |
| commit | 27bcec28bfb7272aa2cbe107c10bdafd5ebc32c9 (patch) | |
| tree | c7229cbb9709f20ab227303e3afd9ff26e55b90b /activerecord | |
| parent | 9ea54b2d8e8180c59f31b035765e058e743660bb (diff) | |
| download | rails-27bcec28bfb7272aa2cbe107c10bdafd5ebc32c9.tar.gz rails-27bcec28bfb7272aa2cbe107c10bdafd5ebc32c9.tar.bz2 rails-27bcec28bfb7272aa2cbe107c10bdafd5ebc32c9.zip | |
Fix mergefail in changelog
The line was duplicated
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/CHANGELOG.md | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index 278e05ab65..866a2eb374 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -68,8 +68,6 @@ * Deprecated use of string argument as a configuration lookup in `ActiveRecord::Base.establish_connection`. Instead, a symbol must be given. -* Deprecated use of string argument as a configuration lookup in `ActiveRecord::Base.establish_connection`. Instead, a symbol must be given. - *José Valim* * Fixed `update_column`, `update_columns`, and `update_all` to correctly serialize |