[Bps-public-commit] r13914 - in Prophet/trunk: .

[sartak at bestpractical.com]

Author: sartak
Date: Wed Jul  9 12:58:23 2008
New Revision: 13914

Modified:
   Prophet/trunk/   (props changed)
   Prophet/trunk/lib/Prophet/Replica.pm

Log:
 r63969 at onn:  sartak | 2008-07-09 12:58:16 -0400
 Load up YAML so YAML::Dump works


Modified: Prophet/trunk/lib/Prophet/Replica.pm
==============================================================================
--- Prophet/trunk/lib/Prophet/Replica.pm	(original)
+++ Prophet/trunk/lib/Prophet/Replica.pm	Wed Jul  9 12:58:23 2008
@@ -359,6 +359,7 @@
 
     return undef unless $conflict->has_conflicting_changes;
 
+    require YAML;
     $self->log("Conflicting changeset: ".YAML::Dump($conflict));
 
     return $conflict;