From 09c5711c11471bed8b080cc3afc9c6ece4e4e6d9 Mon Sep 17 00:00:00 2001
From: Niclas Zimmermann <niclas@kivitendo-premium.de>
Date: Mon, 3 Jun 2013 14:21:52 +0200
Subject: [PATCH] Behebt Conflict

Ein Conflict wurde im letzten merge vergessen zu beheben.
---
 SL/Controller/ClientConfig.pm | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/SL/Controller/ClientConfig.pm b/SL/Controller/ClientConfig.pm
index 148054e4e..fd39fc3cf 100644
--- 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);
 
-<<<<<<< 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);
-=======
+
   SL::DB::Default->get->update_attributes('show_weight'     => $::form->{show_weight});
->>>>>>> gewicht
 
   flash_later('info', $::locale->text('Client Configuration saved!'));
 
-- 
2.20.1