merge conflict resolved

diff --git a/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm b/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm
index ce89f3863cb7ed45f8a5ccdb4065f71bd18ba92b..04142321b223ac7e0e2530b45d0e2cb0c5d36088 100644 (file)
--- a/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm
+++ b/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm
@@ -213,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'));
         }
         $object->set_from_related( $name, $sub_object )
           unless (!$sub_object && !$sub_updates && ($info->{attrs}{join_type} eq 'LEFT'));