diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-08-01 21:22:15 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-08-01 21:22:15 +0200 |
| commit | 99ff7fe6182351cf42af74b36305464fc3a64caf (patch) | |
| tree | 98e3d8dbf94ff75a17424ad4023cafd0a331d326 /editconflict.tmpl | |
| parent | a9881763464190d7f843417c0feb61205882565d (diff) | |
| parent | be3fe912791f7332374ca231422d3a06b05778e9 (diff) | |
Merge branch 'master' into scs
Conflicts (merged manually):
page.tmpl
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> |