Generated.

[homepage.git] / blog / Danmark_g_r_for_ODF_.html

diff --git a/blog/Danmark_g_r_for_ODF_.html b/blog/Danmark_g_r_for_ODF_.html
index 706a149890fb63d948f4dd126e74a50d567ab0ce..d567c7abf5e597b2ef55a083b59994e86fba2040 100644 (file)
--- a/blog/Danmark_g_r_for_ODF_.html
+++ b/blog/Danmark_g_r_for_ODF_.html
@@ -72,7 +72,11 @@ platforme.</blockquote></p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
+<<<<<<< Danmark_g_r_for_ODF_.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.2
 
 </ul></li>
 
@@ -186,7 +190,11 @@ platforme.</blockquote></p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
+<<<<<<< Danmark_g_r_for_ODF_.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.2
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -216,8 +224,13 @@ platforme.</blockquote></p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
+<<<<<<< Danmark_g_r_for_ODF_.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.2
  <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>