removed orig file

2013-11-13 14:18:25 -05:00
parent 665ccb2167
commit d9956caec1
1 changed files with 0 additions and 14 deletions
@@ -1,14 +0,0 @@
-class Performance < ActiveRecord::Base
-  attr_accessible :comments, :date_submitted, :reviewer, :score
-  belongs_to :user  
-  
-  def reviewer_name
-<<<<<<< HEAD
-    u = User.find_by_id(self.reviewer)
-    u.full_name if u.respond_to?('full_name')
-=======
-   u = User.find_by_id(self.reviewer)
-   u.full_name if u.respond_to?('fullname')
->>>>>>> 289716b24c7c4a1d72fcf1cf16fdc003e96e728c
-  end
-end