Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

fixed a silly mistake of not fixing a merge

  • Loading branch information...
commit eaa9c064390c7c303be6e6571a14d7dd611ed07b 1 parent 4c86f07
@zachinglis zachinglis authored
Showing with 0 additions and 5 deletions.
  1. +0 −5 activerecord/lib/active_record/associations.rb
View
5 activerecord/lib/active_record/associations.rb
@@ -658,15 +658,10 @@ 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>
Please sign in to comment.
Something went wrong with that request. Please try again.