Generated.

[homepage.git] / blog / Links_for_2010_10_14.html

diff --git a/blog/Links_for_2010_10_14.html b/blog/Links_for_2010_10_14.html
index a55c57bf439c6038481ab75543e5f354facf102a..42d93a82331c0a203650096365e4daffb7c26a53 100644 (file)
--- a/blog/Links_for_2010_10_14.html
+++ b/blog/Links_for_2010_10_14.html
@@ -90,7 +90,11 @@ forslag for et rent og sikkert Internet.</li>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
+<<<<<<< Links_for_2010_10_14.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.93
 
 </ul></li>
 
@@ -204,7 +208,11 @@ forslag for et rent og sikkert Internet.</li>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
+<<<<<<< Links_for_2010_10_14.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.93
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -234,8 +242,13 @@ forslag for et rent og sikkert Internet.</li>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
+<<<<<<< Links_for_2010_10_14.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.93
  <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>