aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZach Inglis <zach@lt3media.com>2008-08-25 14:22:40 -0400
committerZach Inglis <zach@lt3media.com>2008-08-25 14:22:40 -0400
commiteaa9c064390c7c303be6e6571a14d7dd611ed07b (patch)
tree181daa891e916c3a0144c53c37f3da6b5fdf7e83
parent4c86f074a7e3506886299c6290b539d1bc5f9d03 (diff)
downloadrails-eaa9c064390c7c303be6e6571a14d7dd611ed07b.tar.gz
rails-eaa9c064390c7c303be6e6571a14d7dd611ed07b.tar.bz2
rails-eaa9c064390c7c303be6e6571a14d7dd611ed07b.zip
fixed a silly mistake of not fixing a merge
-rw-r--r--activerecord/lib/active_record/associations.rb5
1 files changed, 0 insertions, 5 deletions
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb
index 88a7b52bfb..eb1281901b 100644
--- a/activerecord/lib/active_record/associations.rb
+++ b/activerecord/lib/active_record/associations.rb
@@ -658,15 +658,10 @@ module ActiveRecord
# (*Note*: +collection+ is replaced with the symbol passed as the first argument, so
# <tt>has_many :clients</tt> would add among others <tt>clients.empty?</tt>.)
#
-<<<<<<< HEAD:activerecord/lib/active_record/associations.rb
# === Example
#
- # A Firm class declares <tt>has_many :clients</tt>, which will add:
- # * <tt>Firm#clients</tt> (similar to <tt>Clients.find :all, :conditions => "firm_id = #{id}"</tt>)
-=======
# Example: A Firm class declares <tt>has_many :clients</tt>, which will add:
# * <tt>Firm#clients</tt> (similar to <tt>Clients.find :all, :conditions => ["firm_id = ?", id]</tt>)
->>>>>>> Corrected interpolation in a model find:activerecord/lib/active_record/associations.rb
# * <tt>Firm#clients<<</tt>
# * <tt>Firm#clients.delete</tt>
# * <tt>Firm#clients=</tt>