Follow-up r36331.
Follow-up r36331.

* subversion/libsvn_ra_serf/auth.c
  (svn_ra_serf__handle_auth): Fixed merge conflict resolution.


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

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