diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2002-07-08 14:11:04 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2002-07-08 14:11:04 +0000 |
| commit | cd3f44af263b270e59345a4bbb6ad6bb7087fa57 (patch) | |
| tree | 60e04b9c76a08730f16b0c0e6f9d007819abbbe4 | |
| parent | ae8d5c553da4ba827b4462c5803d9920ea068fb6 (diff) | |
| download | control-center-cd3f44af263b270e59345a4bbb6ad6bb7087fa57.tar control-center-cd3f44af263b270e59345a4bbb6ad6bb7087fa57.tar.gz control-center-cd3f44af263b270e59345a4bbb6ad6bb7087fa57.tar.bz2 control-center-cd3f44af263b270e59345a4bbb6ad6bb7087fa57.tar.xz control-center-cd3f44af263b270e59345a4bbb6ad6bb7087fa57.zip | |
cleanup
| -rwxr-xr-x | control-center | 7 |
1 files changed, 0 insertions, 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, |