From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Tue, 20 Feb 2007 11:20:11 +0000 (+0000)
Subject: Merge-Überbleibsel entfernt.
X-Git-Tag: release-2.4.2~56
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=7ba6d673fa3b5a9316759670c74e645dd63995fe;p=kivitendo-erp.git

Merge-Überbleibsel entfernt.
---

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|
   	<input type=button onclick=set_history_window(|
@@ -440,8 +435,6 @@ print qq|
   	. $locale->text('history') 
   	. qq|>|;
 # /button for saving history
-=======
->>>>>>> .r1940
   print qq|
 </form>
 
@@ -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|
   	<input type=button onclick=set_history_window(|
@@ -694,8 +682,6 @@ print qq|
   	. $locale->text('history') 
   	. qq|>|;
 # /button for saving history
-=======
->>>>>>> .r1940
   print qq|
 </form>
 
@@ -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|
   	<input type=button onclick=set_history_window(|
@@ -903,8 +884,6 @@ print qq|
   	. $locale->text('history') 
   	. qq|>|;
 # /button for saving history
-=======
->>>>>>> .r1940
   print qq|
 </form>