Generated.

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

diff --git a/blog/archive/2010/09/index.html b/blog/archive/2010/09/index.html
index b4c1e0b5ae9f9dc0febc98f37985f8c7e8a11219..76791fea536bfea2255e2248f549ec6b018b6d13 100644 (file)
--- a/blog/archive/2010/09/index.html
+++ b/blog/archive/2010/09/index.html
@@ -413,11 +413,7 @@ eller bare ser meg om etter alternativer.</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.109
 
 </ul></li>
 
@@ -531,11 +527,7 @@ eller bare ser meg om etter alternativer.</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.109
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -565,13 +557,8 @@ eller bare ser meg om etter alternativer.</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.109
  <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>