diff options
Diffstat (limited to 'templates/editconflict.tmpl')
| -rw-r--r-- | templates/editconflict.tmpl | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/templates/editconflict.tmpl b/templates/editconflict.tmpl deleted file mode 100644 index 1252033..0000000 --- a/templates/editconflict.tmpl +++ /dev/null @@ -1,7 +0,0 @@ -<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> |