aboutsummaryrefslogtreecommitdiffstats
path: root/railties/guides/source/active_record_querying.textile
diff options
context:
space:
mode:
authorVijay Dev <vijaydev.cse@gmail.com>2011-10-05 18:42:18 +0530
committerVijay Dev <vijaydev.cse@gmail.com>2011-10-05 18:42:18 +0530
commit46ce7f1f77b91d3762e7eeab16a19afcb79c8477 (patch)
tree89b3b5c780f130e628a67af48a2a657ee40eda6f /railties/guides/source/active_record_querying.textile
parentae4febdf841f4de2889c05ecd1b2b19e1d7f1697 (diff)
parentea49935a6e0eca8783bc8d1bb46a6c518c073cac (diff)
downloadrails-46ce7f1f77b91d3762e7eeab16a19afcb79c8477.tar.gz
rails-46ce7f1f77b91d3762e7eeab16a19afcb79c8477.tar.bz2
rails-46ce7f1f77b91d3762e7eeab16a19afcb79c8477.zip
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'railties/guides/source/active_record_querying.textile')
-rw-r--r--railties/guides/source/active_record_querying.textile2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/guides/source/active_record_querying.textile b/railties/guides/source/active_record_querying.textile
index 96f91cfef6..b1acdd189a 100644
--- a/railties/guides/source/active_record_querying.textile
+++ b/railties/guides/source/active_record_querying.textile
@@ -616,7 +616,7 @@ c1.first_name = "Michael"
c1.save
c2.name = "should fail"
-c2.save # Raises a ActiveRecord::StaleObjectError
+c2.save # Raises an ActiveRecord::StaleObjectError
</ruby>
You're then responsible for dealing with the conflict by rescuing the exception and either rolling back, merging, or otherwise apply the business logic needed to resolve the conflict.