X-Git-Url: http://pere.pagekite.me/gitweb/homepage.git/blobdiff_plain/3fbf9b15b4169565bb456691e3bc194c04eb30f1..3882048f60f47ce7edb89cc3816978cff32551f9:/blog/data/2013-05-17-skolelinux-blessing.txt

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>