Generated.

[homepage.git] / blog / Circular_package_dependencies_harms_apt_recovery.html

diff --git a/blog/Circular_package_dependencies_harms_apt_recovery.html b/blog/Circular_package_dependencies_harms_apt_recovery.html
index 5d0db5c4b19784e1e491cd9409cbf1b74b79117e..54d7d00a9e3530cee1b3225253ab7111d4533382 100644 (file)
--- a/blog/Circular_package_dependencies_harms_apt_recovery.html
+++ b/blog/Circular_package_dependencies_harms_apt_recovery.html
@@ -104,11 +104,7 @@ it.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Circular_package_dependencies_harms_apt_recovery.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.118
 
 </ul></li>
 
@@ -222,11 +218,7 @@ it.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Circular_package_dependencies_harms_apt_recovery.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.118
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -256,13 +248,8 @@ it.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Circular_package_dependencies_harms_apt_recovery.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.118
  <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>