diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-08-02 00:07:11 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-08-02 00:07:11 +0200 |
| commit | e9e3f7af86eb5704def9c285c99e69924ec159cb (patch) | |
| tree | a10b43abb7167c5280d8c14061efddd0e080bb8b /recentchanges.mdwn | |
| parent | 33e0212176b55c3b8784a4ba26c3a52583a458d3 (diff) | |
| parent | d235993548b5da35412f9ea7a121a85beebb6855 (diff) | |
Merge branch 'master-no_NB' into scs-no_NB
Diffstat (limited to 'recentchanges.mdwn')
| -rw-r--r-- | recentchanges.mdwn | 3 |
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" |