summaryrefslogtreecommitdiff
path: root/recentchanges.mdwn
diff options
context:
space:
mode:
Diffstat (limited to 'recentchanges.mdwn')
-rw-r--r--recentchanges.mdwn5
1 files changed, 3 insertions, 2 deletions
diff --git a/recentchanges.mdwn b/recentchanges.mdwn
index 3383fc7..3ad0e2a 100644
--- a/recentchanges.mdwn
+++ b/recentchanges.mdwn
@@ -1,7 +1,8 @@
+<<<<<<< HEAD:recentchanges.mdwn
[[!if test="enabled(meta)" then="""
-[[!meta title="RecentChanges"]]
+[[!meta title="SenesteÆndringer"]]
"""]]
-Recent changes to this wiki:
+Seneste ændringer til denne wiki:
[[!inline pages="internal(recentchanges/change_*) and !*/Discussion"
template=recentchanges show=0]]