Generated.

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

diff --git a/blog/archive/2009/11/index.html b/blog/archive/2009/11/index.html
index 7f4970a3ee7142468e979e0660504df3ef27a463..d9634d868935efffe5b369b1faade3492cd26344 100644 (file)
--- a/blog/archive/2009/11/index.html
+++ b/blog/archive/2009/11/index.html
@@ -183,7 +183,11 @@ nye i stedet</a>.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<li><a href="http://people.skolelinux.org/pere/blog/archive/2011/09/">September (1)</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.180
 
 </ul></li>
 
@@ -297,7 +301,11 @@ nye i stedet</a>.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
- <li><a href="http://people.skolelinux.org/pere/blog/tags/norsk">norsk (135)</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.180
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -305,7 +313,7 @@ nye i stedet</a>.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/opphavsrett">opphavsrett (22)</a></li>
 
- <li><a href="http://people.skolelinux.org/pere/blog/tags/personvern">personvern (44)</a></li>
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/personvern">personvern (45)</a></li>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/reprap">reprap (11)</a></li>
 
@@ -327,6 +335,13 @@ nye i stedet</a>.</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.180
  <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>