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 382a21f3a63bfa8a5973e52cc61d92b5cd36745d..cf968ba0270031a64e514ecf79165498d57729f7 100644 (file)
--- a/blog/archive/2008/11/index.html
+++ b/blog/archive/2008/11/index.html
@@ -208,11 +208,7 @@ 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>
 
@@ -326,11 +322,7 @@ 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>
 
@@ -360,13 +352,8 @@ 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>