From eaa9c064390c7c303be6e6571a14d7dd611ed07b Mon Sep 17 00:00:00 2001
From: Zach Inglis <zach@lt3media.com>
Date: Mon, 25 Aug 2008 14:22:40 -0400
Subject: fixed a silly mistake of not fixing a merge

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

(limited to 'activerecord')

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>
-- 
cgit v1.2.3