diff options
| author | Piotr Sarnacki <drogus@gmail.com> | 2012-04-21 14:06:03 -0700 |
|---|---|---|
| committer | Piotr Sarnacki <drogus@gmail.com> | 2012-04-21 14:06:03 -0700 |
| commit | 90269802dbf690fbe8be0cd01e3b387a51f02b70 (patch) | |
| tree | 6434c59fbfd63a09f9a8971fd306784cef279f2d /activesupport | |
| parent | a719843d31042690fa4fa8f55bc8a647d360b2a8 (diff) | |
| parent | f98d929e675fb68a4f031ff09ccc8b1dfe00454e (diff) | |
| download | rails-90269802dbf690fbe8be0cd01e3b387a51f02b70.tar.gz rails-90269802dbf690fbe8be0cd01e3b387a51f02b70.tar.bz2 rails-90269802dbf690fbe8be0cd01e3b387a51f02b70.zip | |
Merge pull request #5917 from oscardelben/master
Remove circular require warning
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/time/calculations.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/core_ext/time/calculations.rb b/activesupport/lib/active_support/core_ext/time/calculations.rb index 5076697c04..7add47be44 100644 --- a/activesupport/lib/active_support/core_ext/time/calculations.rb +++ b/activesupport/lib/active_support/core_ext/time/calculations.rb @@ -1,5 +1,4 @@ require 'active_support/duration' -require 'active_support/core_ext/time/zones' require 'active_support/core_ext/time/conversions' class Time |