diff options
| -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, |