aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib
diff options
context:
space:
mode:
authorOscar Del Ben <info@oscardelben.com>2012-04-21 10:50:38 +0200
committerOscar Del Ben <info@oscardelben.com>2012-04-21 10:50:38 +0200
commitf98d929e675fb68a4f031ff09ccc8b1dfe00454e (patch)
tree826c1f845259ca38d542d6fd3908b78f453d7bf7 /activesupport/lib
parented8108300b2bb96f9f6888188f4fb8cd418ab950 (diff)
downloadrails-f98d929e675fb68a4f031ff09ccc8b1dfe00454e.tar.gz
rails-f98d929e675fb68a4f031ff09ccc8b1dfe00454e.tar.bz2
rails-f98d929e675fb68a4f031ff09ccc8b1dfe00454e.zip
Remove circular require of time/zones
Diffstat (limited to 'activesupport/lib')
-rw-r--r--activesupport/lib/active_support/core_ext/time/calculations.rb1
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