Generated.

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

diff --git a/blog/archive/2010/08/index.html b/blog/archive/2010/08/index.html
index f0a6b74d2131ea4c1d92df6ffca2a967f9083d16..f62c1a604e584cfbeaf7509dae1bcb5ecccc0281 100644 (file)
--- a/blog/archive/2010/08/index.html
+++ b/blog/archive/2010/08/index.html
@@ -1010,7 +1010,11 @@ er fremmet av Erna Solberg, Michael Tetzschner og Trond Helleland.</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.121
 
 </ul></li>
 
@@ -1124,7 +1128,11 @@ er fremmet av Erna Solberg, Michael Tetzschner og Trond Helleland.</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.121
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -1154,8 +1162,13 @@ er fremmet av Erna Solberg, Michael Tetzschner og Trond Helleland.</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.121
  <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>