Generated.

[homepage.git] / blog / archive / 2008 / 11 / index.html

diff --git a/blog/archive/2008/11/index.html b/blog/archive/2008/11/index.html
index 0883178f28d65d94167f64f6a8e7b4ff36a4c444..382a21f3a63bfa8a5973e52cc61d92b5cd36745d 100644 (file)
--- a/blog/archive/2008/11/index.html
+++ b/blog/archive/2008/11/index.html
@@ -208,7 +208,11 @@ lenge alt er klart til <a href="http://www.goopen.no/">Go Open
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
+<<<<<<< index.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.261
 
 </ul></li>
 
@@ -322,7 +326,11 @@ lenge alt er klart til <a href="http://www.goopen.no/">Go Open
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
+<<<<<<< index.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.261
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -352,8 +360,13 @@ lenge alt er klart til <a href="http://www.goopen.no/">Go Open
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
+<<<<<<< index.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.261
  <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>