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

[sartak at bestpractical.com]

Author: sartak
Date: Mon Jul 14 12:33:53 2008
New Revision: 14069

Modified:
   Prophet/trunk/   (props changed)
   Prophet/trunk/lib/Prophet/CLI/Command/Merge.pm

Log:
 r64200 at onn:  sartak | 2008-07-14 11:19:44 -0400
 Syntax error fix


Modified: Prophet/trunk/lib/Prophet/CLI/Command/Merge.pm
==============================================================================
--- Prophet/trunk/lib/Prophet/CLI/Command/Merge.pm	(original)
+++ Prophet/trunk/lib/Prophet/CLI/Command/Merge.pm	Mon Jul 14 12:33:53 2008
@@ -45,7 +45,7 @@
     $target->import_changesets(
         from  => $source,
         resdb => $self->app_handle->resdb_handle,
-        ( $resolver ? resolver_class => $resolver : () ),
+        ( $resolver ? (resolver_class => $resolver) : () ),
     );
 }