diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2010-07-20 23:36:27 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2010-07-20 23:36:27 +0200 |
| commit | 139aa616d06771e8042c1921fb3721b3ff4a008a (patch) | |
| tree | 9220e841c4e750e6e89845f5dfe31a08db2d56ee /editconflict.tmpl | |
| parent | 9ced7b77811a5da81bec49b9174d45dc8364e917 (diff) | |
| parent | 306eb61d606fd1ab40ef74866a14267384e0b2d6 (diff) | |
Merge branch 'scs-da' into allinone-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> |