Permalink
Browse files

fixed conflict

  • Loading branch information...
1 parent ffc8b66 commit 5da48bb9a096494ada54472050dc3406d0808cac @jackdempsey committed Jul 22, 2012
Showing with 2 additions and 1 deletion.
  1. +2 −1 app/models/interested_person.rb
@@ -1,6 +1,7 @@
class InterestedPerson < ActiveRecord::Base
validates_uniqueness_of :email
- attr_accessible :email
# scope :already_a_user, joins("left outer join users on users.email = interested_people.email").where("users.id is not null")
# scope :not_a_user, joins("left outer join users on users.email = interested_people.email").where("users.id is null")
+
+ attr_accessible :name, :email
end

0 comments on commit 5da48bb

Please sign in to comment.