[Bps-public-commit] r11406 - in SVN-PropDB: lib/Prophet/Resolver

[jesse at bestpractical.com]

Author: jesse
Date: Wed Apr  2 21:47:05 2008
New Revision: 11406

Modified:
   SVN-PropDB/   (props changed)
   SVN-PropDB/lib/Prophet/Resolver/AlwaysSource.pm

Log:
 r29014 at 70-5-158-116:  jesse | 2008-04-02 14:12:05 -1000
  typo


Modified: SVN-PropDB/lib/Prophet/Resolver/AlwaysSource.pm
==============================================================================
--- SVN-PropDB/lib/Prophet/Resolver/AlwaysSource.pm	(original)
+++ SVN-PropDB/lib/Prophet/Resolver/AlwaysSource.pm	Wed Apr  2 21:47:05 2008
@@ -7,8 +7,8 @@
 
 sub run {
     my $self     = shift;
-    my $conflict = shift;
-    return 0 if $conflict->file_op_conflict;
+    my $conflicting_change = shift;
+    return 0 if $conflicting_change->>file_op_conflict;
 
     my $resolution = Prophet::Change->new_from_conflict($conflicting_change);
     return $resolution;