merge 19889:20181 of rails_port into the openID branch

[rails.git] / app / views / user / view.html.erb

diff --git a/app/views/user/view.html.erb b/app/views/user/view.html.erb
index 4fb973ef4694c3aa2b14162fd8dfb53862c75273..372bd660d28cde0abfa97895196b3cf8d92e4fcf 100644 (file)
--- a/app/views/user/view.html.erb
+++ b/app/views/user/view.html.erb
@@ -144,7 +144,5 @@
 <br/>
 <br/>
 <% if @user and @this_user.id == @user.id %>
 <br/>
 <br/>
 <% if @user and @this_user.id == @user.id %>

-<%= link_to t('user.view.change your settings'), :controller => 'user', :action => 'account', :display_name => @user.display_name %>
-<br/><br/>

 <%= link_to t('user.view.my_oauth_details'), :controller => 'oauth_clients', :action => 'index' %>
 <% end %>
 <%= link_to t('user.view.my_oauth_details'), :controller => 'oauth_clients', :action => 'index' %>
 <% end %>