Permalink
Browse files

Fix mergefail in changelog

The line was duplicated
  • Loading branch information...
1 parent 9ea54b2 commit 27bcec28bfb7272aa2cbe107c10bdafd5ebc32c9 @jonleighton jonleighton committed Jan 4, 2014
Showing with 0 additions and 2 deletions.
  1. +0 −2 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

0 comments on commit 27bcec2

Please sign in to comment.