diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-08-01 21:13:35 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-08-01 21:13:35 +0200 |
| commit | be3fe912791f7332374ca231422d3a06b05778e9 (patch) | |
| tree | 5295c217ac8424a895370d956037a650d6445435 /editconflict.tmpl | |
| parent | 2fb8dbca8338e24e7018355295d8248eba6e1132 (diff) | |
Sync with ikiwiki 2.55.
Diffstat (limited to 'editconflict.tmpl')
| -rw-r--r-- | editconflict.tmpl | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/editconflict.tmpl b/editconflict.tmpl new file mode 100644 index 0000000..1252033 --- /dev/null +++ b/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> |