Generated.

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

diff --git a/blog/archive/2009/08/index.html b/blog/archive/2009/08/index.html
index 0b63d4fdfacb4d20d01794c3e9258377e7a0fde4..4ab8ca07c9255060163aef9704dcc334a61f2269 100644 (file)
--- a/blog/archive/2009/08/index.html
+++ b/blog/archive/2009/08/index.html
@@ -225,11 +225,7 @@ det viser at behovet for fribruks-sjøkart er til stedet.</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.185
 
 </ul></li>
 
@@ -343,11 +339,7 @@ det viser at behovet for fribruks-sjøkart er til stedet.</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.185
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -377,13 +369,8 @@ det viser at behovet for fribruks-sjøkart er til stedet.</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.185
  <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>