Generated.

[homepage.git] / blog / Links_for_2010_10_03.html

diff --git a/blog/Links_for_2010_10_03.html b/blog/Links_for_2010_10_03.html
index 9b0d2c56d22b2a243f36762de505bb969198a491..dd139484c661d9106ae6471f5014da3b79079800 100644 (file)
--- a/blog/Links_for_2010_10_03.html
+++ b/blog/Links_for_2010_10_03.html
@@ -71,11 +71,7 @@ simple setup.
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Links_for_2010_10_03.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.95
 
 </ul></li>
 
@@ -189,11 +185,7 @@ simple setup.
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Links_for_2010_10_03.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.95
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -223,13 +215,8 @@ simple setup.
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Links_for_2010_10_03.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.95
  <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>