diff options
Diffstat (limited to 'ikiwiki-bootstrap-theme/editconflict.tmpl')
| -rw-r--r-- | ikiwiki-bootstrap-theme/editconflict.tmpl | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/ikiwiki-bootstrap-theme/editconflict.tmpl b/ikiwiki-bootstrap-theme/editconflict.tmpl new file mode 100644 index 0000000..1252033 --- /dev/null +++ b/ikiwiki-bootstrap-theme/editconflict.tmpl @@ -0,0 +1,7 @@ +<p class="error"> +<b>Your changes conflict with other changes made to the page.</b> +</p> +<p> +Conflict markers have been inserted into the page content. Reconcile the +conflict and commit again to save your changes. +</p> |