X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=templates%2Fedit_conflict.html;h=8cc30735db4120a281bdffb7174087452748a939;hb=65966a769fea12308cf5a1bccee53d80483ee444;hp=b782e7d2f3a108c36a28265e18a3361eed4ade93;hpb=539becf8debd262c4d7d52eb1a2a79f20da005ff;p=cocanwiki.git diff --git a/templates/edit_conflict.html b/templates/edit_conflict.html index b782e7d..8cc3073 100644 --- a/templates/edit_conflict.html +++ b/templates/edit_conflict.html @@ -8,7 +8,7 @@ -

Edit conflict

Someone else edited that page while you were editing it. This leads