From 4c86f074a7e3506886299c6290b539d1bc5f9d03 Mon Sep 17 00:00:00 2001
From: Zach Inglis <zach@lt3media.com>
Date: Sat, 23 Aug 2008 13:41:54 -0400
Subject: Corrected interpolation in a model find

---
 activerecord/lib/active_record/associations.rb | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'activerecord')

diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb
index 8129d571a6..88a7b52bfb 100644
--- a/activerecord/lib/active_record/associations.rb
+++ b/activerecord/lib/active_record/associations.rb
@@ -658,10 +658,15 @@ 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>
-- 
cgit v1.2.3