X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fpe.pl;h=18c90c30afe3947f3fef4f03d7f91420283d9781;hb=036fe04d0f9d0ccfc7ef563530d3c118986ef0ca;hp=07ba3026df474817f2519cc6846be148c38e64f3;hpb=2b89ec9756dc1d3525b6163fe4cf4f38af83f9d8;p=kivitendo-erp.git
diff --git a/bin/mozilla/pe.pl b/bin/mozilla/pe.pl
index 07ba3026d..18c90c30a 100644
--- a/bin/mozilla/pe.pl
+++ b/bin/mozilla/pe.pl
@@ -427,11 +427,6 @@ sub form_project_footer {
. $locale->text('Delete') . qq|">|;
}
-<<<<<<< .mine
- if ($form->{menubar}) {
- require "$form->{path}/menu.pl";
- &menubar;
- }
# button for saving history
print qq|
text('history')
. qq|>|;
# /button for saving history
-=======
->>>>>>> .r1940
print qq|
@@ -681,11 +674,6 @@ sub form_partsgroup_footer {
. $locale->text('Delete') . qq|">|;
}
-<<<<<<< .mine
- if ($form->{menubar}) {
- require "$form->{path}/menu.pl";
- &menubar;
- }
# button for saving history
print qq|
text('history')
. qq|>|;
# /button for saving history
-=======
->>>>>>> .r1940
print qq|
@@ -890,11 +876,6 @@ sub form_pricegroup_footer {
. $locale->text('Delete') . qq|">|;
}
-<<<<<<< .mine
- if ($form->{menubar}) {
- require "$form->{path}/menu.pl";
- &menubar;
- }
# button for saving history
print qq|
text('history')
. qq|>|;
# /button for saving history
-=======
->>>>>>> .r1940
print qq|