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 | 8291b1c5ff533d92df40d6e9a6f472e2fd96ad97 (patch) | |
| tree | 468b52bd01cb7fca5db03e4de046999a47488f6b /recentchanges.mdwn | |
| parent | 86839cedff336941b826d55bac95f69f789d87f1 (diff) | |
| parent | 85738ebc189eb57685a2c495310a5ba1455e792d (diff) | |
Merge branch 'master-da' into scs-da
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"]] """]] |