diff options
Diffstat (limited to 'activerecord/CHANGELOG')
| -rw-r--r-- | activerecord/CHANGELOG | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index 3a63c08b2d..f82bd0da92 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -163,10 +163,6 @@ end [Santiago Pastorino] -<<<<<<< Updated upstream ->>>>>>> association_fixes -======= ->>>>>>> Stashed changes * Setting the id of a belongs_to object will update the reference to the object. [#2989 state:resolved] |