Generated.

[homepage.git] / blog / Avisene_i_endring.html

diff --git a/blog/Avisene_i_endring.html b/blog/Avisene_i_endring.html
index af3a2705256b01e2156540c08e1123b523a7d4a7..814794a382198baed184edb8319fe87f5c1c0d00 100644 (file)
--- a/blog/Avisene_i_endring.html
+++ b/blog/Avisene_i_endring.html
@@ -62,11 +62,7 @@ eksisterer.  Det blir spennende å se hva vi ender opp med.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Avisene_i_endring.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.219
 
 </ul></li>
 
@@ -180,11 +176,7 @@ eksisterer.  Det blir spennende å se hva vi ender opp med.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Avisene_i_endring.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.219
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -214,13 +206,8 @@ eksisterer.  Det blir spennende å se hva vi ender opp med.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Avisene_i_endring.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.219
  <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>