From cd3f44af263b270e59345a4bbb6ad6bb7087fa57 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Mon, 8 Jul 2002 14:11:04 +0000 Subject: cleanup --- control-center | 7 ------- 1 file changed, 7 deletions(-) diff --git a/control-center b/control-center index 12d41023..75d9bd55 100755 --- a/control-center +++ b/control-center @@ -204,17 +204,10 @@ my @tree = [_("Date & Time") , 'time-mdk'], [_("Software Manager"), 'rpmdrake-mdk'], [_("Logs"), 'logdrake-mdk'], -<<<<<<< control-center - [_("Console"), 'drakboot-mdk'], -======= [_("Console"), 'console-mdk'], -<<<<<<< control-center [_("Users"), 'user-mdk'], ->>>>>>> 1.111 -======= # [_("Users"), 'user-mdk'], # [_("RFBDrake"), 'unknown-mdk'], ->>>>>>> 1.130 ] ], if_($::isWiz, -- cgit v1.2.1