X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=templates%2Fedit_conflict.html;h=8cc30735db4120a281bdffb7174087452748a939;hb=89e8d5757ca111d16ce3dfcc1ce4f2c00a119c85;hp=1ff70ede16c4000b0b215a39d9774a1bb3cef2da;hpb=057ca1f499109d068be9f493348111458336c3a8;p=cocanwiki.git
diff --git a/templates/edit_conflict.html b/templates/edit_conflict.html
index 1ff70ed..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,14 +40,6 @@ to an edit conflict which you have to fix by hand.
-
-
+::include(footer.html)::
\ No newline at end of file