Generated.

[homepage.git] / blog / Software_updates_2010_10_24.html

diff --git a/blog/Software_updates_2010_10_24.html b/blog/Software_updates_2010_10_24.html
index 08010608041ca7a217e0b04d92ce31e1193c3ff2..22523d75a532e4cacab5c28aaa20424abd682417 100644 (file)
--- a/blog/Software_updates_2010_10_24.html
+++ b/blog/Software_updates_2010_10_24.html
@@ -86,11 +86,7 @@ clients to get a Linux desktop on request.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Software_updates_2010_10_24.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.88
 
 </ul></li>
 
@@ -204,11 +200,7 @@ clients to get a Linux desktop on request.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Software_updates_2010_10_24.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.88
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -238,13 +230,8 @@ clients to get a Linux desktop on request.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Software_updates_2010_10_24.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.88
  <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>