Generated.

[homepage.git] / blog / Fiksgatami_tar_form___snart_klar_for_test.html

diff --git a/blog/Fiksgatami_tar_form___snart_klar_for_test.html b/blog/Fiksgatami_tar_form___snart_klar_for_test.html
index 7237187bc77fff1ba1ae83f44afab3aa88a29d03..d9b5b67eaf0a53e71631412edf078aa5762e5383 100644 (file)
--- a/blog/Fiksgatami_tar_form___snart_klar_for_test.html
+++ b/blog/Fiksgatami_tar_form___snart_klar_for_test.html
@@ -103,7 +103,11 @@ epostadresse for innsender, og det tror jeg vi skal fortsette med.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
+<<<<<<< Fiksgatami_tar_form___snart_klar_for_test.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.39
 
 </ul></li>
 
@@ -217,7 +221,11 @@ epostadresse for innsender, og det tror jeg vi skal fortsette med.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
+<<<<<<< Fiksgatami_tar_form___snart_klar_for_test.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.39
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -247,8 +255,13 @@ epostadresse for innsender, og det tror jeg vi skal fortsette med.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
+<<<<<<< Fiksgatami_tar_form___snart_klar_for_test.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.39
  <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>