Behebt Conflict

Ein Conflict wurde im letzten merge vergessen zu beheben.

diff --git a/SL/Controller/ClientConfig.pm b/SL/Controller/ClientConfig.pm
index 148054e4e810fac0b84dafbaf25a6fbe13d62bf3..fd39fc3cf67a82c996573fe7477bc59dc1ebef62 100644 (file)
--- a/SL/Controller/ClientConfig.pm
+++ b/SL/Controller/ClientConfig.pm
@@ -79,16 +79,14 @@ sub action_save {
 
   map { SL::DB::Default->get->update_attributes($_ => $::form->{$_}); } qw(sales_order_show_delete purchase_order_show_delete sales_delivery_order_show_delete purchase_delivery_order_show_delete);
 
 
   map { SL::DB::Default->get->update_attributes($_ => $::form->{$_}); } qw(sales_order_show_delete purchase_order_show_delete sales_delivery_order_show_delete purchase_delivery_order_show_delete);
 

-<<<<<<< HEAD

   # undef warehouse_id if the empty value is selected
   if ( ($::form->{warehouse_id} == 0) && ($::form->{bin_id} == 0) ) {
     undef $::form->{warehouse_id};
     undef $::form->{bin_id};
   }
   map { SL::DB::Default->get->update_attributes($_ => $::form->{$_}); } qw(warehouse_id bin_id);
   # undef warehouse_id if the empty value is selected
   if ( ($::form->{warehouse_id} == 0) && ($::form->{bin_id} == 0) ) {
     undef $::form->{warehouse_id};
     undef $::form->{bin_id};
   }
   map { SL::DB::Default->get->update_attributes($_ => $::form->{$_}); } qw(warehouse_id bin_id);

-=======
+

   SL::DB::Default->get->update_attributes('show_weight'     => $::form->{show_weight});
   SL::DB::Default->get->update_attributes('show_weight'     => $::form->{show_weight});

->>>>>>> gewicht

 
   flash_later('info', $::locale->text('Client Configuration saved!'));
 
 
   flash_later('info', $::locale->text('Client Configuration saved!'));