Revision 7ba6d673
Von Moritz Bunkus vor mehr als 17 Jahren hinzugefügt
| bin/mozilla/pe.pl | ||
|---|---|---|
| 427 | 427 |
. $locale->text('Delete') . qq|">|;
|
| 428 | 428 |
} |
| 429 | 429 |
|
| 430 |
<<<<<<< .mine |
|
| 431 |
if ($form->{menubar}) {
|
|
| 432 |
require "$form->{path}/menu.pl";
|
|
| 433 |
&menubar; |
|
| 434 |
} |
|
| 435 | 430 |
# button for saving history |
| 436 | 431 |
print qq| |
| 437 | 432 |
<input type=button onclick=set_history_window(| |
| ... | ... | |
| 440 | 435 |
. $locale->text('history')
|
| 441 | 436 |
. qq|>|; |
| 442 | 437 |
# /button for saving history |
| 443 |
======= |
|
| 444 |
>>>>>>> .r1940 |
|
| 445 | 438 |
print qq| |
| 446 | 439 |
</form> |
| 447 | 440 |
|
| ... | ... | |
| 681 | 674 |
. $locale->text('Delete') . qq|">|;
|
| 682 | 675 |
} |
| 683 | 676 |
|
| 684 |
<<<<<<< .mine |
|
| 685 |
if ($form->{menubar}) {
|
|
| 686 |
require "$form->{path}/menu.pl";
|
|
| 687 |
&menubar; |
|
| 688 |
} |
|
| 689 | 677 |
# button for saving history |
| 690 | 678 |
print qq| |
| 691 | 679 |
<input type=button onclick=set_history_window(| |
| ... | ... | |
| 694 | 682 |
. $locale->text('history')
|
| 695 | 683 |
. qq|>|; |
| 696 | 684 |
# /button for saving history |
| 697 |
======= |
|
| 698 |
>>>>>>> .r1940 |
|
| 699 | 685 |
print qq| |
| 700 | 686 |
</form> |
| 701 | 687 |
|
| ... | ... | |
| 890 | 876 |
. $locale->text('Delete') . qq|">|;
|
| 891 | 877 |
} |
| 892 | 878 |
|
| 893 |
<<<<<<< .mine |
|
| 894 |
if ($form->{menubar}) {
|
|
| 895 |
require "$form->{path}/menu.pl";
|
|
| 896 |
&menubar; |
|
| 897 |
} |
|
| 898 | 879 |
# button for saving history |
| 899 | 880 |
print qq| |
| 900 | 881 |
<input type=button onclick=set_history_window(| |
| ... | ... | |
| 903 | 884 |
. $locale->text('history')
|
| 904 | 885 |
. qq|>|; |
| 905 | 886 |
# /button for saving history |
| 906 |
======= |
|
| 907 |
>>>>>>> .r1940 |
|
| 908 | 887 |
print qq| |
| 909 | 888 |
</form> |
| 910 | 889 |
|
Auch abrufbar als: Unified diff
Merge-Überbleibsel entfernt.