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

diff --git a/blog/Skolelinux_intervju__Viggo_Fedreheim.html b/blog/Skolelinux_intervju__Viggo_Fedreheim.html
index 307279ee5d..dbcecd6a19 100644
--- a/blog/Skolelinux_intervju__Viggo_Fedreheim.html
+++ b/blog/Skolelinux_intervju__Viggo_Fedreheim.html
@@ -119,7 +119,11 @@ servere.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
+<<<<<<< Skolelinux_intervju__Viggo_Fedreheim.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.50
 
 </ul></li>
 
@@ -233,7 +237,11 @@ servere.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
+<<<<<<< Skolelinux_intervju__Viggo_Fedreheim.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.50
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -263,8 +271,13 @@ servere.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
+<<<<<<< Skolelinux_intervju__Viggo_Fedreheim.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.50
  <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>