Generated.

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

diff --git a/blog/archive/2009/04/index.html b/blog/archive/2009/04/index.html
index 25ece20cc38c617a4f44c1370ff9fb12b6d61c46..ccad0e87a8b1f0a2ce06579c95c43dbe59628c13 100644 (file)
--- a/blog/archive/2009/04/index.html
+++ b/blog/archive/2009/04/index.html
@@ -490,7 +490,11 @@ properties.</p>
 
 <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.215
 
 </ul></li>
 
@@ -604,7 +608,11 @@ properties.</p>
 
  <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.215
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -634,8 +642,13 @@ properties.</p>
 
  <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.215
  <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>