From 2a6f4282b91d81dca2c58febc84ed98de9bea466 Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Tue, 3 Jun 2014 20:13:31 -0700
Subject: Cleaned up duplicated CHANGELOG entry [ci skip]

---
 activerecord/CHANGELOG.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'activerecord')

diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 7ea3bde2bc..e2e4e5305c 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -585,12 +585,11 @@
 
     *arthurnn*
 
-*   Passing an Active Record object to `find` is now deprecated.  Call `.id`
-    on the object first.
-
 *   Passing an Active Record object to `find` or `exists?` is now deprecated.
     Call `.id` on the object first.
 
+    *Aaron Patterson*
+
 *   Only use BINARY for MySQL case sensitive uniqueness check when column has a case insensitive collation.
 
     *Ryuta Kamizono*
-- 
cgit v1.2.3