Generated.

[homepage.git] / blog / Automatic_upgrade_testing_from_Lenny_to_Squeeze.html

diff --git a/blog/Automatic_upgrade_testing_from_Lenny_to_Squeeze.html b/blog/Automatic_upgrade_testing_from_Lenny_to_Squeeze.html
index 177526182f1f4307cb5051c047ff2033bba5aa33..0f590b4c0fe2bb8e1624ee76777a44100cf50bb3 100644 (file)
--- a/blog/Automatic_upgrade_testing_from_Lenny_to_Squeeze.html
+++ b/blog/Automatic_upgrade_testing_from_Lenny_to_Squeeze.html
@@ -175,11 +175,7 @@ packages.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Automatic_upgrade_testing_from_Lenny_to_Squeeze.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.143
 
 </ul></li>
 
@@ -293,11 +289,7 @@ packages.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Automatic_upgrade_testing_from_Lenny_to_Squeeze.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.143
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -327,13 +319,8 @@ packages.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Automatic_upgrade_testing_from_Lenny_to_Squeeze.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.143
  <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>