From 0390766ff700ce62a582637b605e15e1521ed395 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Sun, 3 Aug 2008 14:02:31 +0200
Subject: Fix strip patch noise in recentchanges.mdwn.

---
 recentchanges.mdwn | 1 -
 1 file changed, 1 deletion(-)

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"]]
 """]]
-- 
cgit v1.2.3