Generated.

[homepage.git] / blog / archive / 2009 / 10 / index.html

diff --git a/blog/archive/2009/10/index.html b/blog/archive/2009/10/index.html
index 628c6c99c1de4ebc2ec0eaab5b44c64219570a11..60fa42d637a94d4bca6c0d828fba45cb2fd57054 100644 (file)
--- a/blog/archive/2009/10/index.html
+++ b/blog/archive/2009/10/index.html
@@ -196,11 +196,7 @@ nettbankkontroll over egne midler. :(
 
 <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.182
 
 </ul></li>
 
@@ -314,11 +310,7 @@ nettbankkontroll over egne midler. :(
 
  <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.182
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -348,13 +340,8 @@ nettbankkontroll over egne midler. :(
 
  <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.182
  <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>