diff options
author | Daniel Silverstone <dsilvers@digital-scurf.org> | 2017-02-04 09:48:07 +0000 |
---|---|---|
committer | Daniel Silverstone <dsilvers@digital-scurf.org> | 2017-02-04 09:48:07 +0000 |
commit | 3eac7ff5269b52ac322fb2328802df5ca517bc1b (patch) | |
tree | ab261bfba2d3148509806a988324d1a4bb8b7e51 /ikiwiki-bootstrap-theme/editcreationconflict.tmpl | |
download | netsurf-wiki-3eac7ff5269b52ac322fb2328802df5ca517bc1b.tar.gz netsurf-wiki-3eac7ff5269b52ac322fb2328802df5ca517bc1b.tar.bz2 |
Initial setup content
Diffstat (limited to 'ikiwiki-bootstrap-theme/editcreationconflict.tmpl')
-rw-r--r-- | ikiwiki-bootstrap-theme/editcreationconflict.tmpl | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/ikiwiki-bootstrap-theme/editcreationconflict.tmpl b/ikiwiki-bootstrap-theme/editcreationconflict.tmpl new file mode 100644 index 0000000..c99102f --- /dev/null +++ b/ikiwiki-bootstrap-theme/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> |