Permalink
Browse files

Merge pull request #5917 from oscardelben/master

Remove circular require warning
  • Loading branch information...
2 parents a719843 + f98d929 commit 90269802dbf690fbe8be0cd01e3b387a51f02b70 @drogus drogus committed Apr 21, 2012
Showing with 0 additions and 1 deletion.
  1. +0 −1 activesupport/lib/active_support/core_ext/time/calculations.rb
View
1 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

0 comments on commit 9026980

Please sign in to comment.