summaryrefslogtreecommitdiff
path: root/recentchanges.mdwn
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2008-08-02 00:04:59 +0200
committerJonas Smedegaard <dr@jones.dk>2008-08-02 00:04:59 +0200
commit86839cedff336941b826d55bac95f69f789d87f1 (patch)
treea10b43abb7167c5280d8c14061efddd0e080bb8b /recentchanges.mdwn
parent858fa053fd73ce60f4660eea47eb5771e8cea988 (diff)
parentd235993548b5da35412f9ea7a121a85beebb6855 (diff)
Merge branch 'master-da' into scs-da
Diffstat (limited to 'recentchanges.mdwn')
-rw-r--r--recentchanges.mdwn3
1 files changed, 3 insertions, 0 deletions
diff --git a/recentchanges.mdwn b/recentchanges.mdwn
index 4513fc6..3ad0e2a 100644
--- a/recentchanges.mdwn
+++ b/recentchanges.mdwn
@@ -1,4 +1,7 @@
+<<<<<<< HEAD:recentchanges.mdwn
+[[!if test="enabled(meta)" then="""
[[!meta title="SenesteÆndringer"]]
+"""]]
Seneste ændringer til denne wiki:
[[!inline pages="internal(recentchanges/change_*) and !*/Discussion"