X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;ds=sidebyside;f=templates%2Fedit_conflict.html;h=d176c57943c576cb310fcf19556b1d39ec5c46b8;hb=5def59b20559a1d352d0d9c3304d9b09c2523b41;hp=234c3473b8ef25271a1964726ce6551d0e083541;hpb=3062d573a7617339324c23cdd4755f8f04956b92;p=cocanwiki.git diff --git a/templates/edit_conflict.html b/templates/edit_conflict.html index 234c347..d176c57 100644 --- a/templates/edit_conflict.html +++ b/templates/edit_conflict.html @@ -44,7 +44,8 @@ to an edit conflict which you have to fix by hand.