From 5f3486c0b48081090c58940f5ed21a591c4cdf2f Mon Sep 17 00:00:00 2001 From: Nicholas Seckar Date: Tue, 15 Aug 2006 02:04:25 +0000 Subject: cleanup git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4764 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/CHANGELOG | 1 - 1 file changed, 1 deletion(-) (limited to 'actionpack') diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 175d3f46bf..faa4f1cb08 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -8,7 +8,6 @@ * Tweak RoutingError message to show option diffs, not just missing named route significant keys. [Rick Olson] ->>>>>>> .r4761 * Invoke method_missing directly on hidden actions. Closes #3030. [Nicholas Seckar] * Require Tempfile explicitly for TestUploadedFile due to changes in class auto loading. [Rick Olson] -- cgit v1.2.3