diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-08-31 00:24:05 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-08-31 00:24:05 +0200 |
| commit | 3805d01c9b0ee6681d3e36233a82731200b87d34 (patch) | |
| tree | 0c50c954f6561c64438dc14a7771f9ac4c320003 /activerecord/lib/active_record | |
| parent | d37a65307d280e47eb5c15b61c0b20ac6cab6a84 (diff) | |
| parent | c30f6c270da5cd2ad7605ee9255f052e93609e30 (diff) | |
| download | rails-3805d01c9b0ee6681d3e36233a82731200b87d34.tar.gz rails-3805d01c9b0ee6681d3e36233a82731200b87d34.tar.bz2 rails-3805d01c9b0ee6681d3e36233a82731200b87d34.zip | |
resolves merge conflict
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/persistence.rb | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/persistence.rb b/activerecord/lib/active_record/persistence.rb index bf8089f042..1b016f0895 100644 --- a/activerecord/lib/active_record/persistence.rb +++ b/activerecord/lib/active_record/persistence.rb @@ -18,9 +18,6 @@ module ActiveRecord !(new_record? || destroyed?) end - # :call-seq: - # save(options) - # # Saves the model. # # If the model is new a record gets created in the database, otherwise |