Fix merge conflict

[rails.git] / app / views / oauth / authorize_failure.html.erb

<% content_for :heading do %>
  <h1>You have disallowed this request</h1>
<% end %>