diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2010-10-14 13:37:33 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2010-10-14 13:37:33 +0200 |
| commit | 84b24bb78093106008157c05a7e4cfe0bb6f5fd1 (patch) | |
| tree | fa5ec77e53ba062015a5cbf79213edf61919ac7f /editcreationconflict.tmpl | |
Sync with ikiwiki 3.20100926.
Diffstat (limited to 'editcreationconflict.tmpl')
| -rw-r--r-- | editcreationconflict.tmpl | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/editcreationconflict.tmpl b/editcreationconflict.tmpl new file mode 100644 index 0000000..c99102f --- /dev/null +++ b/editcreationconflict.tmpl @@ -0,0 +1,9 @@ +<p class="error"> +<b>While you were creating this page, someone else independently created a page +with the same name.</b> +</p> +<p> +The edit box below contains the page's current content, followed by the +content you entered previously, to allow you to merge the two +together before saving. +</p> |