fix problematic merge

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

diff --git a/app/models/diary_entry.rb b/app/models/diary_entry.rb
index 2da92d400648a564eecc1bdd66c6841190b6245f..ad334151c37f8eafc786b7a8fe9212c7d6ad523e 100644 (file)
--- a/app/models/diary_entry.rb
+++ b/app/models/diary_entry.rb
@@ -1,2 +1,3 @@
 class DiaryEntry < ActiveRecord::Base
+  belongs_to :user
 end