X-Git-Url: https://pere.pagekite.me/gitweb/homepage.git/blobdiff_plain/731de269dafd5a472cc57ec6aaa815c6ef289719..923b4898cf78ff810ace3dac6439e6656f30d5f5:/blog/BSAs_p_stander_om_piratkopiering_m_ter_motstand.html

diff --git a/blog/BSAs_p_stander_om_piratkopiering_m_ter_motstand.html b/blog/BSAs_p_stander_om_piratkopiering_m_ter_motstand.html
index c1be4359bf..9b99cbe19d 100644
--- a/blog/BSAs_p_stander_om_piratkopiering_m_ter_motstand.html
+++ b/blog/BSAs_p_stander_om_piratkopiering_m_ter_motstand.html
@@ -83,7 +83,11 @@ på Slashdot</a>.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
+<<<<<<< BSAs_p_stander_om_piratkopiering_m_ter_motstand.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>
 
@@ -197,7 +201,11 @@ på Slashdot</a>.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
+<<<<<<< BSAs_p_stander_om_piratkopiering_m_ter_motstand.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>
 
@@ -227,8 +235,13 @@ på Slashdot</a>.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
+<<<<<<< BSAs_p_stander_om_piratkopiering_m_ter_motstand.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>