Cleanup.

diff --git a/blog/data/2013-05-17-skolelinux-blessing.txt b/blog/data/2013-05-17-skolelinux-blessing.txt
index 0b805e535a1b047d171dd1b455bbe392517545d7..62610e9b2789ecc3a4510915b5bc12c694ddf69f 100644 (file)
--- 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>