diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-08-01 22:02:12 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-08-01 22:02:12 +0200 |
| commit | 6eba9be55e8ce9f33f5f919d66bb84807c6bd330 (patch) | |
| tree | 0cdc6d744f24b06febadc52617e9bedb92a5931b /editconflict.tmpl | |
| parent | 90f21c9df7116875db9459b3a835f8bb0d9d96e3 (diff) | |
| parent | 4fb9600af4d836e61a341531507380465b715226 (diff) | |
Merge branch 'master-no_NB' into scs-no_NB
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..83089b3 --- /dev/null +++ b/editconflict.tmpl @@ -0,0 +1,7 @@ +<p> +<b>Dine rettelser er i strid med andre retttelser foretaget på siden.</b> +</p> +<p> +Modstridende områder er blevet markeret i sidens indhold. Løs problemet og +aflevér igen for at gemme dine rettelser. +</p> |