Bumped version for release.

[cocanwiki.git] / templates / edit_conflict.html
diff --git a/templates/edit_conflict.html b/templates/edit_conflict.html

index 1ff70ed..8cc3073 100644 (file)
--- a/templates/edit_conflict.html
+++ b/templates/edit_conflict.html
@@ -2,14 +2,13 @@
  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
  <head>
  <title>Edit conflict</title>
-<meta name="robots" content="noindex,nofollow"/>
  <meta name="author" content="http://www.merjis.com/" />
  <link rel="stylesheet" href="/_css/standard.css" type="text/css" title="Standard"/>
  <link rel="stylesheet" href="/_css/editor.css" type="text/css" title="Standard"/>
  <script src="/_js/editor.js" type="text/javascript"></script>
  </head><body>
  
-<h1>Edit conflict</h1>
+<h1><span>Edit conflict</span></h1>
  
  <p>
  Someone else edited that page while you were editing it.  This leads
@@ -41,14 +40,6 @@ to an <strong>edit conflict</strong> which you have to fix by hand.
  </tr>
  </table>
  
-<div id="footer_div">
-<hr/>
-
-<ul id="footer" class="menu">
-<li class="first"> <a href="/copyright">Copyright &copy; ::year::</a> </li>
-<li> Powered by <a href="http://sandbox.merjis.com/">::cocanwiki_package_html:: ::cocanwiki_version_html::</a> </li>
-</ul>
-</div>
-
+::include(footer.html)::
  </body>
  </html>
 \ No newline at end of file