X-Git-Url: https://pere.pagekite.me/gitweb/homepage.git/blobdiff_plain/731de269dafd5a472cc57ec6aaa815c6ef289719..923b4898cf78ff810ace3dac6439e6656f30d5f5:/blog/Bombing_og_skyting.html?ds=inline

diff --git a/blog/Bombing_og_skyting.html b/blog/Bombing_og_skyting.html
index 529720b7d8..764f8af041 100644
--- a/blog/Bombing_og_skyting.html
+++ b/blog/Bombing_og_skyting.html
@@ -65,7 +65,11 @@ dvs.  å gjøre samfunnet vårt verre for innbyggerne.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
+<<<<<<< Bombing_og_skyting.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.15
 
 </ul></li>
 
@@ -179,7 +183,11 @@ dvs.  å gjøre samfunnet vårt verre for innbyggerne.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
+<<<<<<< Bombing_og_skyting.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.15
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -209,8 +217,13 @@ dvs.  å gjøre samfunnet vårt verre for innbyggerne.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
+<<<<<<< Bombing_og_skyting.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.15
  <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>