diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2004-08-11 09:03:38 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2004-08-11 09:03:38 +0000 |
| commit | 21b22afeb700bff409e218cd79d2e32252bcffea (patch) | |
| tree | 67b912aeda6a0585636314e20b3990ca6f3641e1 /drakpxelinux.pl | |
| parent | 791ae0f00f068662e15f1c033450bde0d8f80982 (diff) | |
| download | drakpxelinux-21b22afeb700bff409e218cd79d2e32252bcffea.tar drakpxelinux-21b22afeb700bff409e218cd79d2e32252bcffea.tar.gz drakpxelinux-21b22afeb700bff409e218cd79d2e32252bcffea.tar.bz2 drakpxelinux-21b22afeb700bff409e218cd79d2e32252bcffea.tar.xz drakpxelinux-21b22afeb700bff409e218cd79d2e32252bcffea.zip | |
typo fix
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 }; } |