diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2010-07-20 22:37:57 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2010-07-20 22:37:57 +0200 |
| commit | ea16b1e537ffb534d11c7d7dac262259fd03f601 (patch) | |
| tree | b0891d604ea2ce86bd19a482072e4c902441700f /editconflict.tmpl | |
| parent | def09d5f933d4867a3f1a4e1382ca0c32e429ef7 (diff) | |
| parent | ee62a82c4be0125da6b4758e43e231a3c28c857f (diff) | |
Merge branch 'master-da' into scs-da
Conflicts (manually resolved):
misc.tmpl
page.tmpl
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> |