From 27bcec28bfb7272aa2cbe107c10bdafd5ebc32c9 Mon Sep 17 00:00:00 2001 From: Jon Leighton Date: Sat, 4 Jan 2014 09:30:01 +0000 Subject: [PATCH] Fix mergefail in changelog The line was duplicated --- activerecord/CHANGELOG.md | 2 -- 1 file changed, 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