svn commit: r1027614 - /subversion/trunk/subversion/libsvn_wc/props.c

[hwright]

Author: hwright
Date: Tue Oct 26 16:05:01 2010
New Revision: 1027614

URL: http://svn.apache.org/viewvc?rev=1027614&view=rev
Log:
* subversion/libsvn_wc/props.c
  (svn_wc__merge_props): Whitespace fix.

Modified:
    subversion/trunk/subversion/libsvn_wc/props.c

Modified: subversion/trunk/subversion/libsvn_wc/props.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/props.c?rev=1027614&r1=1027613&r2=1027614&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/props.c (original)
+++ subversion/trunk/subversion/libsvn_wc/props.c Tue Oct 26 16:05:01 2010
@@ -1577,7 +1577,8 @@ svn_wc__merge_props(svn_wc_notify_state_
         SVN_ERR(svn_wc__wq_tmp_build_set_property_conflict_marker(
                                           &work_item,
                                           db, local_abspath,
-                                          svn_dirent_basename(reject_path, 
NULL),
+                                          svn_dirent_basename(reject_path,
+                                                              NULL),
                                           scratch_pool, scratch_pool));
 
         SVN_ERR(svn_wc__db_wq_add(db, local_abspath, work_item, scratch_pool));