Generated.

[homepage.git] / blog / Mer_l_gnpropaganda_fra_BSA.html

diff --git a/blog/Mer_l_gnpropaganda_fra_BSA.html b/blog/Mer_l_gnpropaganda_fra_BSA.html
index da05fd7d75c4e7ffef791b8508718d84d8770b1a..04410f5e99c2b17f6e31883b5b74a8f847876acd 100644 (file)
--- a/blog/Mer_l_gnpropaganda_fra_BSA.html
+++ b/blog/Mer_l_gnpropaganda_fra_BSA.html
@@ -106,7 +106,11 @@ føre til at flere tar i bruk fri programvare.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
+<<<<<<< Mer_l_gnpropaganda_fra_BSA.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>
 
@@ -220,7 +224,11 @@ føre til at flere tar i bruk fri programvare.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
+<<<<<<< Mer_l_gnpropaganda_fra_BSA.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>
 
@@ -250,8 +258,13 @@ føre til at flere tar i bruk fri programvare.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
+<<<<<<< Mer_l_gnpropaganda_fra_BSA.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>