1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00

Fix mergefail in changelog

The line was duplicated
This commit is contained in:
Jon Leighton 2014-01-04 09:30:01 +00:00
parent 9ea54b2d8e
commit 27bcec28bf

View file

@ -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