Generated.

[homepage.git] / blog / Skolelinux_intervju__Astri_Sletteng.html

diff --git a/blog/Skolelinux_intervju__Astri_Sletteng.html b/blog/Skolelinux_intervju__Astri_Sletteng.html
index 30277f27a590cd5d37dc849b57304433ded71d54..f0e753c691cad46fd91313669f6602d2a5543a91 100644 (file)
--- a/blog/Skolelinux_intervju__Astri_Sletteng.html
+++ b/blog/Skolelinux_intervju__Astri_Sletteng.html
@@ -121,7 +121,11 @@ er en god strategi å bruke.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
+<<<<<<< Skolelinux_intervju__Astri_Sletteng.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.34
 
 </ul></li>
 
@@ -235,7 +239,11 @@ er en god strategi å bruke.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
+<<<<<<< Skolelinux_intervju__Astri_Sletteng.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.34
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -265,8 +273,13 @@ er en god strategi å bruke.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
+<<<<<<< Skolelinux_intervju__Astri_Sletteng.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.34
  <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>