diff options
| author | Lars Wirzenius <liw@liw.fi> | 2020-11-27 11:20:59 +0200 |
|---|---|---|
| committer | Lars Wirzenius <liw@liw.fi> | 2020-11-27 12:26:58 +0200 |
| commit | 193673fa4ca986a8503dded44019f3b0eac30084 (patch) | |
| tree | 441a292813ee0b009b995da8a28cbf9619f29778 /templates/editconflict.tmpl | |
| parent | 0fcccd0e80382492b7346a2f13ca593577855418 (diff) | |
| download | obnam.org-193673fa4ca986a8503dded44019f3b0eac30084.tar.gz | |
add local copies of ikiwiki templates
Diffstat (limited to 'templates/editconflict.tmpl')
| -rw-r--r-- | templates/editconflict.tmpl | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/templates/editconflict.tmpl b/templates/editconflict.tmpl new file mode 100644 index 0000000..1252033 --- /dev/null +++ b/templates/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> |