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


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

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