diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2010-07-20 23:39:29 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2010-07-20 23:39:29 +0200 |
| commit | 0320e1ce5b9884929d1b0d2616f9e62d75dc5cae (patch) | |
| tree | d59f108cf63fd0629904ec3806443e95ad94475b /editconflict.tmpl | |
| parent | f8310d930525b56e60d364fda7eb10d5e0ff0762 (diff) | |
| parent | ee62a82c4be0125da6b4758e43e231a3c28c857f (diff) | |
Merge branch 'master-da' into master-nonedit-da
Diffstat (limited to 'editconflict.tmpl')
| -rw-r--r-- | editconflict.tmpl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/editconflict.tmpl b/editconflict.tmpl index 83089b3..10e4b85 100644 --- a/editconflict.tmpl +++ b/editconflict.tmpl @@ -1,4 +1,4 @@ -<p> +<p class="error"> <b>Dine rettelser er i strid med andre retttelser foretaget på siden.</b> </p> <p> |