Generated.

[homepage.git] / blog / archive / 2010 / 06 / index.html

diff --git a/blog/archive/2010/06/index.html b/blog/archive/2010/06/index.html
index b662da7a30a00732fec5e935fccda7c9173ca618..cf3986beb24df7488b1e511c1078b4474527dba9 100644 (file)
--- a/blog/archive/2010/06/index.html
+++ b/blog/archive/2010/06/index.html
@@ -990,7 +990,11 @@ changes, it will not be an option for Debian Edu based on Squeeze.</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.162
 
 </ul></li>
 
@@ -1104,7 +1108,11 @@ changes, it will not be an option for Debian Edu based on Squeeze.</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.162
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -1134,8 +1142,13 @@ changes, it will not be an option for Debian Edu based on Squeeze.</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.162
  <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>