Permalink
Browse files

Corrected interpolation in a model find

  • Loading branch information...
1 parent 4e6f914 commit 4c86f074a7e3506886299c6290b539d1bc5f9d03 @zachinglis zachinglis committed Aug 23, 2008
Showing with 5 additions and 0 deletions.
  1. +5 −0 activerecord/lib/active_record/associations.rb
@@ -658,10 +658,15 @@ module ClassMethods
# (*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>

0 comments on commit 4c86f07

Please sign in to comment.