Permalink
Browse files

cleanup

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4764 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 7678d12 commit 5f3486c0b48081090c58940f5ed21a591c4cdf2f @seckar seckar committed Aug 15, 2006
Showing with 0 additions and 1 deletion.
  1. +0 −1 actionpack/CHANGELOG
View
@@ -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]

0 comments on commit 5f3486c

Please sign in to comment.