* subversion/libsvn_wc/update_editor.c   (check_tree_conflict): Remove special case for files that ignores property     changes and conflicts.
* subversion/libsvn_wc/update_editor.c
  (check_tree_conflict): Remove special case for files that ignores property
    changes and conflicts.

jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion