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 /editconflict.tmpl | |
Sync with ikiwiki 3.20100926.
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> |