X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=templates%2Fedit_conflict.html;h=8cc30735db4120a281bdffb7174087452748a939;hb=65966a769fea12308cf5a1bccee53d80483ee444;hp=234c3473b8ef25271a1964726ce6551d0e083541;hpb=3062d573a7617339324c23cdd4755f8f04956b92;p=cocanwiki.git
diff --git a/templates/edit_conflict.html b/templates/edit_conflict.html
index 234c347..8cc3073 100644
--- a/templates/edit_conflict.html
+++ b/templates/edit_conflict.html
@@ -2,14 +2,13 @@
Edit conflict
-
-Edit conflict
+Edit conflict
Someone else edited that page while you were editing it. This leads
@@ -41,11 +40,6 @@ to an edit conflict which you have to fix by hand.
-
-
-
-
+::include(footer.html)::
\ No newline at end of file