Resolve conflict

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

<p><%= t'user_block.not_found.sorry', :id => params[:id] %></p>

<%= link_to t('user_block.not_found.back'), user_blocks_path %>