Resolve conflict

[rails.git] / app / views / diary_entry / _diary_list_entry.html.erb

<%= render :partial => "diary_entry", :object => diary_list_entry %>