X-Git-Url: https://pere.pagekite.me/gitweb/homepage.git/blobdiff_plain/731de269dafd5a472cc57ec6aaa815c6ef289719..923b4898cf78ff810ace3dac6439e6656f30d5f5:/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 801ac11c91..bc4d3770ee 100644 --- 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.

  • August (6)
  • +<<<<<<< Lenny__Squeeze_upgrades__removals_by_apt_and_aptitude.html +
  • September (3)
  • +=======
  • September (2)
  • +>>>>>>> 1.140 @@ -338,7 +342,11 @@ continue.

  • multimedia (13)
  • +<<<<<<< Lenny__Squeeze_upgrades__removals_by_apt_and_aptitude.html +
  • norsk (137)
  • +=======
  • norsk (136)
  • +>>>>>>> 1.140
  • nuug (119)
  • @@ -368,8 +376,13 @@ continue.

  • surveillance (9)
  • +<<<<<<< Lenny__Squeeze_upgrades__removals_by_apt_and_aptitude.html +
  • valg (6)
  • + +=======
  • valg (5)
  • +>>>>>>> 1.140
  • video (20)
  • vitenskap (1)