* build.conf   (__ALL_TESTS__): Fix reference to conflict-data-test.
* build.conf
  (__ALL_TESTS__): Fix reference to conflict-data-test.

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