]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/blob - templates/editcreationconflict.tmpl
Merge branch 'master' into po
[git.ikiwiki.info.git] / templates / editcreationconflict.tmpl
1 <p class="error">
2 <b>While you were creating this page, someone else independently created a page
3 with the same name.</b>
4 </p>
5 <p>
6 The edit box below contains the page's current content, followed by the
7 content you entered previously, to allow you to merge the two
8 together before saving.
9 </p>