merge conflict resolved
authorZbigniew Lukasiak <zby@zby.aster.net.pl>
Tue, 6 Apr 2010 08:37:19 +0000 (10:37 +0200)
committerZbigniew Lukasiak <zby@zby.aster.net.pl>
Tue, 6 Apr 2010 08:37:19 +0000 (10:37 +0200)
1  2 
lib/DBIx/Class/ResultSet/RecursiveUpdate.pm

index ce89f3863cb7ed45f8a5ccdb4065f71bd18ba92b,eeec84cdd240e2007b07101c2d3cd784f184ce62..04142321b223ac7e0e2530b45d0e2cb0c5d36088
@@@ -213,8 -214,8 +213,8 @@@ sub _update_relation 
              }
          }
          elsif( ! ref $sub_updates ){
-             $sub_object = $related_result->find( $sub_updates )
-              unless (!$sub_updates && ($info->{attrs}{join_type} eq 'LEFT'));
+             $sub_object = $related_result->find( $sub_updates ) 
 -             unless (!$sub_updates && ($info->{attrs}{join_type} eq 'LEFT'));
++                unless (!$sub_updates && ($info->{attrs}{join_type} eq 'LEFT'));
          }
          $object->set_from_related( $name, $sub_object )
            unless (!$sub_object && !$sub_updates && ($info->{attrs}{join_type} eq 'LEFT'));
This page took 0.020982 seconds and 4 git commands to generate.