Resolve conflict

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

diff --git a/app/views/diary_entry/edit.html.erb b/app/views/diary_entry/edit.html.erb
index c49573bec8da201f681e0b5e53e643d40be2759d..4021eaa4d30bf515cd14f2353dc8f88d512b9f75 100644 (file)
--- a/app/views/diary_entry/edit.html.erb
+++ b/app/views/diary_entry/edit.html.erb
@@ -19,7 +19,7 @@
         <label class="standard-label"><%= t 'diary_entry.edit.body' -%></label>
         <%= richtext_area :diary_entry, :body, :cols => 80, :rows => 20, :format => @diary_entry.body_format %>
       </div>
-      <div clas='form-row'>
+      <div class='form-row'>
         <label class="standard-label"><%= t 'diary_entry.edit.language' -%></label>
         <%= f.collection_select :language_code, Language.order(:english_name), :code, :name %>
     </div>