* subversion/libsvn_wc/wc_db.h   (svn_wc__db_op_set_props): Indicate that 'conflict' can be null.
* subversion/libsvn_wc/wc_db.h
  (svn_wc__db_op_set_props): Indicate that 'conflict' can be null.

git-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@1418479 13f79535-47bb-0310-9956-ffa450edef68

YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion