X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=templates%2Fedit_conflict.html;h=1ff70ede16c4000b0b215a39d9774a1bb3cef2da;hb=057ca1f499109d068be9f493348111458336c3a8;hp=d176c57943c576cb310fcf19556b1d39ec5c46b8;hpb=9f9a92d2a7a26fd2413b5751f94af218d70e67d1;p=cocanwiki.git diff --git a/templates/edit_conflict.html b/templates/edit_conflict.html index d176c57..1ff70ed 100644 --- a/templates/edit_conflict.html +++ b/templates/edit_conflict.html @@ -41,12 +41,14 @@ to an edit conflict which you have to fix by hand. + \ No newline at end of file