diff options
Diffstat (limited to 'drakpxelinux.pl')
| -rw-r--r-- | drakpxelinux.pl | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drakpxelinux.pl b/drakpxelinux.pl index 0a20e30..1964a82 100644 --- a/drakpxelinux.pl +++ b/drakpxelinux.pl @@ -430,11 +430,7 @@ sub test_similar_label { # err_dialog(N("hmm.."), N("You should provide a new label name.")) and return 0; # } els if (any { /^label\s$newlabel$/ } cat_($conf)) { -<<<<<<< drakpxelinux.pl - err_dialog(N("Error !"), N("Found a similar entry in PXE list labeled : %s.\nChoose another label please", $newlabel)) and return 0; -======= - err_dialog(N("Error!"), N("Found a similar entry in PXE list labeled: %s.\nChoose another label please",$newlabel)) and return 0; ->>>>>>> 1.24 + err_dialog(N("Error!"), N("Found a similar entry in PXE list labeled: %s.\nChoose another label please", $newlabel)) and return 0; } else { return 1 }; } |