Merge branch 'master' into moderation

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

diff --git a/app/views/user_blocks/edit.html.erb b/app/views/user_blocks/edit.html.erb
index 0b928de548084ce449570cce3892e90b80512547..0eee8a6f642a1ee60781bfafbb11da9010ae9039 100644 (file)
--- a/app/views/user_blocks/edit.html.erb
+++ b/app/views/user_blocks/edit.html.erb
@@ -28,4 +28,4 @@
   <p>
     <%= f.submit t('user_block.edit.submit') %>
   </p>
-<% end %>
\ No newline at end of file
+<% end %>