Generated.

[homepage.git] / blog / Lenny__Squeeze_upgrades__removals_by_apt_and_aptitude.html

diff --git a/blog/Lenny__Squeeze_upgrades__removals_by_apt_and_aptitude.html b/blog/Lenny__Squeeze_upgrades__removals_by_apt_and_aptitude.html
index 801ac11c9147a8ac94cb0b705dda11ad1b8fed6e..bc4d3770ee14449ca5afb258108af742c501642c 100644 (file)
--- a/blog/Lenny__Squeeze_upgrades__removals_by_apt_and_aptitude.html
+++ b/blog/Lenny__Squeeze_upgrades__removals_by_apt_and_aptitude.html
@@ -224,7 +224,11 @@ continue.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
+<<<<<<< Lenny__Squeeze_upgrades__removals_by_apt_and_aptitude.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.140
 
 </ul></li>
 
@@ -338,7 +342,11 @@ continue.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
+<<<<<<< Lenny__Squeeze_upgrades__removals_by_apt_and_aptitude.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.140
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -368,8 +376,13 @@ continue.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
+<<<<<<< Lenny__Squeeze_upgrades__removals_by_apt_and_aptitude.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.140
  <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>