Generated.

[homepage.git] / blog / 2_Spykee_roboter_i_hus__n__skal_det_lekes.html

diff --git a/blog/2_Spykee_roboter_i_hus__n__skal_det_lekes.html b/blog/2_Spykee_roboter_i_hus__n__skal_det_lekes.html
index d533b2bacb5b76b7dbacd66e68ed471aea5e627a..f6370acc38a6e3e29ff950f11710aefbdd439475 100644 (file)
--- a/blog/2_Spykee_roboter_i_hus__n__skal_det_lekes.html
+++ b/blog/2_Spykee_roboter_i_hus__n__skal_det_lekes.html
@@ -78,7 +78,11 @@ firmwaren. :)</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
+<<<<<<< 2_Spykee_roboter_i_hus__n__skal_det_lekes.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.2
 
 </ul></li>
 
@@ -192,7 +196,11 @@ firmwaren. :)</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
+<<<<<<< 2_Spykee_roboter_i_hus__n__skal_det_lekes.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.2
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -222,8 +230,13 @@ firmwaren. :)</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
+<<<<<<< 2_Spykee_roboter_i_hus__n__skal_det_lekes.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.2
  <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>