Generated.

[homepage.git] / blog / Hva_er_egentlig_en__pen_standard_.html

diff --git a/blog/Hva_er_egentlig_en__pen_standard_.html b/blog/Hva_er_egentlig_en__pen_standard_.html
index 8158c0c25626827e86c159633dfd25e5cac63b78..5286e4f5a2795b31fcf306d9438730d6a72fbc09 100644 (file)
--- a/blog/Hva_er_egentlig_en__pen_standard_.html
+++ b/blog/Hva_er_egentlig_en__pen_standard_.html
@@ -154,7 +154,11 @@ av en standard for at en standard skal kunne kalles fri og åpen.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
+<<<<<<< Hva_er_egentlig_en__pen_standard_.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>
 
@@ -268,7 +272,11 @@ av en standard for at en standard skal kunne kalles fri og åpen.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
+<<<<<<< Hva_er_egentlig_en__pen_standard_.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>
 
@@ -298,8 +306,13 @@ av en standard for at en standard skal kunne kalles fri og åpen.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
+<<<<<<< Hva_er_egentlig_en__pen_standard_.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>