fix problematic merge

[rails.git] / app / models / diary_entry.rb

class DiaryEntry < ActiveRecord::Base
  belongs_to :user
end