* subversion/libsvn_wc/conflicts.c
  (read_prop_conflicts): Correctly set the conflict 'action' and 'reason'.

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