Generated.

[homepage.git] / blog / Bombing_og_skyting.html

diff --git a/blog/Bombing_og_skyting.html b/blog/Bombing_og_skyting.html
index 764f8af0419eef621a470a7f786785dcbadc3719..ea1180e40fdf0cc7ee364fb459e6e40f9eaf62d2 100644 (file)
--- a/blog/Bombing_og_skyting.html
+++ b/blog/Bombing_og_skyting.html
@@ -65,11 +65,7 @@ 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>
 
@@ -183,11 +179,7 @@ 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>
 
@@ -217,13 +209,8 @@ 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>