diff options
Diffstat (limited to 'editconflict.tmpl')
| -rw-r--r-- | editconflict.tmpl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/editconflict.tmpl b/editconflict.tmpl index 83089b3..1252033 100644 --- a/editconflict.tmpl +++ b/editconflict.tmpl @@ -1,7 +1,7 @@ -<p> -<b>Dine rettelser er i strid med andre retttelser foretaget på siden.</b> +<p class="error"> +<b>Your changes conflict with other changes made to the page.</b> </p> <p> -Modstridende områder er blevet markeret i sidens indhold. Løs problemet og -aflevér igen for at gemme dine rettelser. +Conflict markers have been inserted into the page content. Reconcile the +conflict and commit again to save your changes. </p> |