Follow-up to r33017:
Follow-up to r33017:

* subversion/libsvn_wc/util.c
  (svn_wc_conflict_description_create_text),
  (svn_wc_conflict_description_create_prop): Use apr_pcalloc instead
    of apr_palloc to allocate memory. This way, we don't need to set
    any members to NULL manually.

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

wbond/subversion,wbond/subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion