Generated.

[homepage.git] / blog / A_manual_for_standards_wars___.html

diff --git a/blog/A_manual_for_standards_wars___.html b/blog/A_manual_for_standards_wars___.html
index bd6c0ca4db71bd2abd81a26700df542befc184b5..2dba814a4fea565df7c30cb9265889ed11834006 100644 (file)
--- a/blog/A_manual_for_standards_wars___.html
+++ b/blog/A_manual_for_standards_wars___.html
@@ -62,7 +62,11 @@ following the standards wars of today.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
+<<<<<<< A_manual_for_standards_wars___.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.146
 
 </ul></li>
 
@@ -176,7 +180,11 @@ following the standards wars of today.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
+<<<<<<< A_manual_for_standards_wars___.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.146
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -206,8 +214,13 @@ following the standards wars of today.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
+<<<<<<< A_manual_for_standards_wars___.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.146
  <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>