Generated.

[homepage.git] / blog / Skolelinux_intervju__Marius_Kotsbak.html

diff --git a/blog/Skolelinux_intervju__Marius_Kotsbak.html b/blog/Skolelinux_intervju__Marius_Kotsbak.html
index e2d5d85c5cbfe9138e2823f502a3fc3a3307769d..c137b41e8a391531717e8d6aa2473a2bda83cd95 100644 (file)
--- a/blog/Skolelinux_intervju__Marius_Kotsbak.html
+++ b/blog/Skolelinux_intervju__Marius_Kotsbak.html
@@ -118,7 +118,11 @@ av.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
+<<<<<<< Skolelinux_intervju__Marius_Kotsbak.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.26
 
 </ul></li>
 
@@ -232,7 +236,11 @@ av.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
+<<<<<<< Skolelinux_intervju__Marius_Kotsbak.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.26
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -262,8 +270,13 @@ av.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
+<<<<<<< Skolelinux_intervju__Marius_Kotsbak.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.26
  <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>