Generated.

[homepage.git] / blog / My_first_perl_GUI_application___controlling_a_Spykee_robot.html

diff --git a/blog/My_first_perl_GUI_application___controlling_a_Spykee_robot.html b/blog/My_first_perl_GUI_application___controlling_a_Spykee_robot.html
index 2a7c3bc9834c97cc405cefc0b027cecebd52ce35..330ab244f97d21f2e96c2e1277da0722a66dd247 100644 (file)
--- a/blog/My_first_perl_GUI_application___controlling_a_Spykee_robot.html
+++ b/blog/My_first_perl_GUI_application___controlling_a_Spykee_robot.html
@@ -104,11 +104,7 @@ those that want to check back later to find it.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< My_first_perl_GUI_application___controlling_a_Spykee_robot.html
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/09/">September (3)</a></li>
-=======
-<li><a href="http://people.skolelinux.org/pere/blog/archive/2011/09/">September (2)</a></li>
->>>>>>> 1.104
 
 </ul></li>
 
@@ -222,11 +218,7 @@ those that want to check back later to find it.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< My_first_perl_GUI_application___controlling_a_Spykee_robot.html
  <li><a href="http://people.skolelinux.org/pere/blog/tags/norsk">norsk (137)</a></li>
-=======
- <li><a href="http://people.skolelinux.org/pere/blog/tags/norsk">norsk (136)</a></li>
->>>>>>> 1.104
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -256,13 +248,8 @@ those that want to check back later to find it.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< My_first_perl_GUI_application___controlling_a_Spykee_robot.html
  <li><a href="http://people.skolelinux.org/pere/blog/tags/valg">valg (6)</a></li>
 
-=======
- <li><a href="http://people.skolelinux.org/pere/blog/tags/valg">valg (5)</a></li>
-
->>>>>>> 1.104
  <li><a href="http://people.skolelinux.org/pere/blog/tags/video">video (20)</a></li>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/vitenskap">vitenskap (1)</a></li>