From 14a65cd982161364028da312f415c1ebe0bcd5ac Mon Sep 17 00:00:00 2001 From: Marcos Tapajos Date: Mon, 2 Jun 2008 09:47:53 -0500 Subject: Fixed changelog merge. Signed-off-by: Joshua Peek --- activesupport/CHANGELOG | 1 - 1 file changed, 1 deletion(-) (limited to 'activesupport/CHANGELOG') diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG index 690bb987dc..15c25debf4 100644 --- a/activesupport/CHANGELOG +++ b/activesupport/CHANGELOG @@ -166,7 +166,6 @@ * Introduce ActiveSupport::TimeWithZone, for wrapping Time instances with a TimeZone. Introduce instance methods to Time for creating TimeWithZone instances, and class methods for managing a global time zone. [Geoff Buesing] ->>>>>>> .r8815 * Replace non-dst-aware TimeZone class with dst-aware class from tzinfo_timezone plugin. TimeZone#adjust and #unadjust are no longer available; tzinfo gem must now be present in order to perform time zone calculations, via #local_to_utc and #utc_to_local methods. [Geoff Buesing] * Extract ActiveSupport::Callbacks from Active Record, test case setup and teardown, and ActionController::Dispatcher. #10727 [Josh Peek] -- cgit v1.2.3