Fix conflict

2015-07-18 21:58:43 +02:00
parent 9cd3d77536 d29d2ca65d
commit 984984473f
6 changed files with 18 additions and 18 deletions
--- a/app/views/devise/menu/_login_items.html.erb
+++ b/app/views/devise/menu/_login_items.html.erb
@@ -1,11 +1,11 @@
 <div style="float:right; margin-right:50px">
  <% if user_signed_in? %>
    <li>
-      <%= link_to('Logout', destroy_user_session_path, :method => :delete) %>
+      <%= link_to('Logout', destroy_user_session_path, method: :delete) %>
    </li>
  <% else %>
    <li>
-      <%= link_to('Login', new_user_session_path)  %>  
+      <%= link_to('Login', new_user_session_path)  %>
    </li>
  <% end %>
 </div>