X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=templates%2Fedit_conflict.html;h=1ce2faef6274b9cc6d36ff9a7e78072660e7a119;hb=6eacefcb7258db7b56fe796af84961cafac90eac;hp=1ff70ede16c4000b0b215a39d9774a1bb3cef2da;hpb=057ca1f499109d068be9f493348111458336c3a8;p=cocanwiki.git

diff --git a/templates/edit_conflict.html b/templates/edit_conflict.html
index 1ff70ed..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"/>
