summaryrefslogtreecommitdiff
path: root/editconflict.tmpl
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2008-08-01 22:00:20 +0200
committerJonas Smedegaard <dr@jones.dk>2008-08-01 22:00:20 +0200
commit18a148e567f54d6b11b54e403b359abe0d878eca (patch)
tree0cdc6d744f24b06febadc52617e9bedb92a5931b /editconflict.tmpl
parent90f21c9df7116875db9459b3a835f8bb0d9d96e3 (diff)
parent4fb9600af4d836e61a341531507380465b715226 (diff)
Merge branch 'master-da' into scs-da
Conflicts (merged manually): page.tmpl
Diffstat (limited to 'editconflict.tmpl')
-rw-r--r--editconflict.tmpl7
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>