Browse files

Fixed changelog merge.

Signed-off-by: Joshua Peek <>
  • Loading branch information...
tapajos authored and josh committed Jun 2, 2008
1 parent 4210d85 commit 14a65cd982161364028da312f415c1ebe0bcd5ac
Showing with 0 additions and 1 deletion.
  1. +0 −1 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]

0 comments on commit 14a65cd

Please sign in to comment.