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 | 1a5c4f89bc1624471aa627095d31d2421c828703 (patch) | |
| tree | 7aa7650194dde7c8574966e2d62a252929a7f47d /recentchanges.mdwn | |
| parent | a8376916ec262b14202287383de4d4de7f832755 (diff) | |
| parent | 85738ebc189eb57685a2c495310a5ba1455e792d (diff) | |
Merge branch 'master-no_NB' into clean-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"]] """]] |