Generated.

[homepage.git] / blog / archive / 2011 / 08 / index.html

diff --git a/blog/archive/2011/08/index.html b/blog/archive/2011/08/index.html
index 7cb51d42d4ceb3d75d4253299f19337f5280d24c..72168a95874fc3841770c251751aed853eada003 100644 (file)
--- a/blog/archive/2011/08/index.html
+++ b/blog/archive/2011/08/index.html
@@ -347,7 +347,11 @@ Jeg håper det blir bedre etter flytting i oktober.</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.13
 
 </ul></li>
 
@@ -461,7 +465,11 @@ Jeg håper det blir bedre etter flytting i oktober.</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.13
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -491,8 +499,13 @@ Jeg håper det blir bedre etter flytting i oktober.</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.13
  <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>