summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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"]]
"""]]