From d08cba7403fb1080a018af4c9591df52964d037d Mon Sep 17 00:00:00 2001
From: Petter Reinholdtsen <pere@hungry.com>
Date: Fri, 17 May 2013 10:21:18 +0000
Subject: [PATCH] Cleanup.

---
 blog/data/2013-05-17-skolelinux-blessing.txt | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/blog/data/2013-05-17-skolelinux-blessing.txt b/blog/data/2013-05-17-skolelinux-blessing.txt
index 0b805e535a..62610e9b27 100644
--- a/blog/data/2013-05-17-skolelinux-blessing.txt
+++ b/blog/data/2013-05-17-skolelinux-blessing.txt
@@ -49,11 +49,7 @@ the needed packages.</p>
 <p>The script was created to help a Debian Edu student working on
 setting up <a href="http://www.raspberrypi.org">Raspberry Pi</a> as a
 Debian Edu client, and using it he can take the existing
-<<<<<<< 2013-05-17-skolelinux-blessing.txt
-<a href="http://www.raspbian.org/‎">Rapbian</a> installation and
-=======
-<a href="http://www.raspbian.org/‎">Raspbian</a> installation and
->>>>>>> 1.3
+<a href="http://www.raspbian.org/FrontPage‎">Raspbian</a> installation and
 transform it into a fully functioning Debian Edu Workstation (or
 Roaming Workstation, or whatever :).</p>
 
-- 
2.47.2