diff options
author | José Valim <jose.valim@gmail.com> | 2009-06-19 16:10:24 +0200 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2009-06-19 16:10:24 +0200 |
commit | 8037fee9ff1dd13c421e6689229457c1ef084074 (patch) | |
tree | c60b2bf3e297be3e1bccb64ffd034acb137a7aa8 /activesupport/lib/active_support/core_ext/module.rb | |
parent | 908b5305d4446433433313e315deb4083c58233e (diff) | |
parent | 9f7eaea201b2f408d9effbf82f2731957e284adf (diff) | |
download | rails-8037fee9ff1dd13c421e6689229457c1ef084074.tar.gz rails-8037fee9ff1dd13c421e6689229457c1ef084074.tar.bz2 rails-8037fee9ff1dd13c421e6689229457c1ef084074.zip |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'activesupport/lib/active_support/core_ext/module.rb')
-rw-r--r-- | activesupport/lib/active_support/core_ext/module.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/core_ext/module.rb b/activesupport/lib/active_support/core_ext/module.rb index 215c47b114..fbe89fe07c 100644 --- a/activesupport/lib/active_support/core_ext/module.rb +++ b/activesupport/lib/active_support/core_ext/module.rb @@ -7,5 +7,4 @@ require 'active_support/core_ext/module/attr_internal' require 'active_support/core_ext/module/attr_accessor_with_default' require 'active_support/core_ext/module/delegation' require 'active_support/core_ext/module/loading' -require 'active_support/core_ext/module/model_naming' require 'active_support/core_ext/module/synchronization' |