aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/core_ext
diff options
context:
space:
mode:
authorOscar Del Ben <info@oscardelben.com>2012-04-21 10:50:38 +0200
committerArun Agrawal <arunagw@gmail.com>2012-04-29 00:07:39 +0530
commit61d84e0e81b0ae65952d2e02fe97c50c122b943f (patch)
tree1fc020d7aa747db31fbd8c71f632b5888b2104df /activesupport/lib/active_support/core_ext
parent434be0fd69a58cc744cd48c0d69440df1102b157 (diff)
downloadrails-61d84e0e81b0ae65952d2e02fe97c50c122b943f.tar.gz
rails-61d84e0e81b0ae65952d2e02fe97c50c122b943f.tar.bz2
rails-61d84e0e81b0ae65952d2e02fe97c50c122b943f.zip
Remove circular require of time/zones
Diffstat (limited to 'activesupport/lib/active_support/core_ext')
-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 69b98d24d3..d845cd1c77 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