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 04410f5e99c2b17f6e31883b5b74a8f847876acd..5e07ad95d6cc25022265f76f739b635815cda0ad 100644 (file)
--- a/blog/Mer_l_gnpropaganda_fra_BSA.html
+++ b/blog/Mer_l_gnpropaganda_fra_BSA.html
@@ -106,11 +106,7 @@ 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>
 
@@ -224,11 +220,7 @@ 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>
 
@@ -258,13 +250,8 @@ 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>