summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2008-08-03 14:02:31 +0200
committerJonas Smedegaard <dr@jones.dk>2008-08-03 14:02:31 +0200
commit0390766ff700ce62a582637b605e15e1521ed395 (patch)
tree8a404a8666df9f9b02beab618ca8552c766d39af
parentd54df2ddea58c27f77c1f321307cf0e0e87d5bfc (diff)
Fix strip patch noise in recentchanges.mdwn.
-rw-r--r--recentchanges.mdwn1
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"]]
"""]]