Generated.

[homepage.git] / blog / Fri_og__pen_standard__slik_Digistan_ser_det.html

diff --git a/blog/Fri_og__pen_standard__slik_Digistan_ser_det.html b/blog/Fri_og__pen_standard__slik_Digistan_ser_det.html
index b232a4ca4fe1eacdeb0b66951fb484c4e95638ab..a88c0e8f5d6bcf039bae9bb4e0cee9a2d9ec2400 100644 (file)
--- a/blog/Fri_og__pen_standard__slik_Digistan_ser_det.html
+++ b/blog/Fri_og__pen_standard__slik_Digistan_ser_det.html
@@ -107,7 +107,11 @@ produkter basert på standarden.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
+<<<<<<< Fri_og__pen_standard__slik_Digistan_ser_det.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>
 
@@ -221,7 +225,11 @@ produkter basert på standarden.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
+<<<<<<< Fri_og__pen_standard__slik_Digistan_ser_det.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>
 
@@ -251,8 +259,13 @@ produkter basert på standarden.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
+<<<<<<< Fri_og__pen_standard__slik_Digistan_ser_det.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>