diff options
| author | José Valim <jose.valim@gmail.com> | 2009-07-21 12:51:53 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2009-07-21 12:51:53 +0200 |
| commit | 33048b6e2738ff73b612dbcb35955189221dfbd0 (patch) | |
| tree | 7e32f6031199c1e7ee9a3e5a15789b5f568a565d /activemodel/lib/active_model.rb | |
| parent | edda0bfe76fc9b2adcdb705665aaef2769e6ef03 (diff) | |
| parent | 9d7aae710384fb5f04129c35b86c5ea5fb9d83a9 (diff) | |
| download | rails-33048b6e2738ff73b612dbcb35955189221dfbd0.tar.gz rails-33048b6e2738ff73b612dbcb35955189221dfbd0.tar.bz2 rails-33048b6e2738ff73b612dbcb35955189221dfbd0.zip | |
Solving merge conflicts.
Diffstat (limited to 'activemodel/lib/active_model.rb')
| -rw-r--r-- | activemodel/lib/active_model.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/activemodel/lib/active_model.rb b/activemodel/lib/active_model.rb index f988cd71b8..2de19597b1 100644 --- a/activemodel/lib/active_model.rb +++ b/activemodel/lib/active_model.rb @@ -26,8 +26,7 @@ $:.unshift(activesupport_path) if File.directory?(activesupport_path) require 'active_support' module ActiveModel - autoload :Attributes, 'active_model/attributes' - autoload :Base, 'active_model/base' + autoload :Conversion, 'active_model/conversion' autoload :DeprecatedErrorMethods, 'active_model/deprecated_error_methods' autoload :Errors, 'active_model/errors' autoload :Name, 'active_model/naming' |