* subversion/libsvn_wc/conflicts.c
  (read_tree_conflict_desc): Add a ### comment.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1619731 13f79535-47bb-0310-9956-ffa450edef68
* subversion/libsvn_wc/update_editor.c
  (check_tree_conflict): Remove unnecessary forward declaration.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1619735 13f79535-47bb-0310-9956-ffa450edef68