I know we all love > but we can't all have them

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4678 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

actionpack/CHANGELOG

@@ -4,7 +4,6 @@
 
 * Added months and years to the resolution of DateHelper#distance_of_time_in_words, such that "60 days ago" becomes "2 months ago" #5611 [pjhyett@gmail.com]
 
->>>>>>> .r4676
 * Short documentation to mention use of Mime::Type.register. #5710 [choonkeat@gmail.com]
 
 * Make controller_path available as an instance method.  #5724 [jmckible@gmail.com]