X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=templates%2Fedit_conflict.html;h=1ce2faef6274b9cc6d36ff9a7e78072660e7a119;hb=591dad4597f28e469a054a900cb3d52e7cc0b56f;hp=d176c57943c576cb310fcf19556b1d39ec5c46b8;hpb=1f125fd7a6794f352f30de71a3905d5356a07008;p=cocanwiki.git

diff --git a/templates/edit_conflict.html b/templates/edit_conflict.html
index d176c57..1ce2fae 100644
--- a/templates/edit_conflict.html
+++ b/templates/edit_conflict.html
@@ -2,7 +2,6 @@
 <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"/>
@@ -41,12 +40,14 @@ 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>
 
 </body>
 </html>
\ No newline at end of file
