diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-08-04 02:32:16 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-08-04 02:32:16 +0200 |
| commit | 609e630d4fae5332cc2d9fce7be21400f13ea73e (patch) | |
| tree | 468b52bd01cb7fca5db03e4de046999a47488f6b /recentchanges.mdwn | |
| parent | e9e3f7af86eb5704def9c285c99e69924ec159cb (diff) | |
| parent | 85738ebc189eb57685a2c495310a5ba1455e792d (diff) | |
Merge branch 'master-no_NB' into scs-no_NB
Diffstat (limited to 'recentchanges.mdwn')
| -rw-r--r-- | recentchanges.mdwn | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/recentchanges.mdwn b/recentchanges.mdwn index 3ad0e2a..a8a4bf2 100644 --- a/recentchanges.mdwn +++ b/recentchanges.mdwn @@ -1,4 +1,3 @@ -<<<<<<< HEAD:recentchanges.mdwn [[!if test="enabled(meta)" then=""" [[!meta title="SenesteÆndringer"]] """]] |