* subversion/tests/libsvn_client/conflicts-test.c: Set max_threads to 1    in an attempt to fix the Mac OS X buildbot which has been failing since    theses tests were added.
* subversion/tests/libsvn_client/conflicts-test.c: Set max_threads to 1
   in an attempt to fix the Mac OS X buildbot which has been failing since
   theses tests were added.


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

YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion