diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-01-05 08:50:32 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-01-05 08:50:32 -0800 |
| commit | dcd317b262ad787a4ed0ef45d879802b22339adc (patch) | |
| tree | 641dd8284b5295d553315047c78a8117c7b8d995 /activerecord | |
| parent | 44951c8d44bebbb94f7a19b043b3eddcbd8b4657 (diff) | |
| parent | dbf78b0c852e535e4bd48cc2c0a3a15532732721 (diff) | |
| download | rails-dcd317b262ad787a4ed0ef45d879802b22339adc.tar.gz rails-dcd317b262ad787a4ed0ef45d879802b22339adc.tar.bz2 rails-dcd317b262ad787a4ed0ef45d879802b22339adc.zip | |
Merge pull request #4325 from juanpastas/master
erased duplicated line
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/base.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index 5c8dbd1b47..d4d0220fb7 100644 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -7,7 +7,6 @@ require 'active_support/time' require 'active_support/core_ext/class/attribute' require 'active_support/core_ext/class/attribute_accessors' require 'active_support/core_ext/class/delegating_attributes' -require 'active_support/core_ext/class/attribute' require 'active_support/core_ext/array/extract_options' require 'active_support/core_ext/hash/deep_merge' require 'active_support/core_ext/hash/indifferent_access' |