Generated.

[homepage.git] / blog / ISO_still_hope_to_fix_OOXML.html

diff --git a/blog/ISO_still_hope_to_fix_OOXML.html b/blog/ISO_still_hope_to_fix_OOXML.html
index d894de26b2e121d6c91842932beba12ee02ac8c2..f456dbc32491691376f27ac590ed7e771170605c 100644 (file)
--- a/blog/ISO_still_hope_to_fix_OOXML.html
+++ b/blog/ISO_still_hope_to_fix_OOXML.html
@@ -71,7 +71,11 @@ seminar this autumn.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
+<<<<<<< ISO_still_hope_to_fix_OOXML.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>
 
@@ -185,7 +189,11 @@ seminar this autumn.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
+<<<<<<< ISO_still_hope_to_fix_OOXML.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>
 
@@ -215,8 +223,13 @@ seminar this autumn.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
+<<<<<<< ISO_still_hope_to_fix_OOXML.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>