diff app/views/common/.svn/text-base/error.html.erb.svn-base @ 514:7eba09d624db live

Merge
author Chris Cannam
date Thu, 14 Jul 2011 10:50:53 +0100
parents cbce1fd3b1b7
children
line wrap: on
line diff
--- a/app/views/common/.svn/text-base/error.html.erb.svn-base	Thu Jul 14 10:46:20 2011 +0100
+++ b/app/views/common/.svn/text-base/error.html.erb.svn-base	Thu Jul 14 10:50:53 2011 +0100
@@ -1,6 +1,6 @@
-<h2><%=h @status %></h2>
-
-<p id="errorExplanation"><%=h @message %></p>
-<p><a href="javascript:history.back()">Back</a></p>
-
-<% html_title @status %>
+<h2><%=h @status %></h2>
+
+<p id="errorExplanation"><%=h @message %></p>
+<p><a href="javascript:history.back()">Back</a></p>
+
+<% html_title @status %>