From ea2d585a664909596b5fa9222af0236cd12b1225 Mon Sep 17 00:00:00 2001
From: Chris Lamb <chris@chris-lamb.co.uk>
Date: Tue, 9 Sep 2008 20:24:36 +0100
Subject: Removing packages from rescue list where they 'Conflict:' with each
 other.

---
 lists/rescue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lists/rescue b/lists/rescue
index 7bc149f..b4e1bea 100644
--- a/lists/rescue
+++ b/lists/rescue
@@ -37,7 +37,7 @@ syslinux-common
 #endif
 #if ARCHITECTURE i386
 pstack
-grub-pc syslinux mbr
+syslinux mbr
 #endif
 
 # Editors
@@ -116,7 +116,6 @@ strongswan
 sipcalc
 socat
 ssh
-telnet
 telnet-ssl
 whois
 irssi
-- 
cgit v1.0