* build.conf:   (private-includes): Follow-up to r27245, remove the   ConflictResolverCallback.Result class header file in favor of the   ConflictResult class header file.
* build.conf:
  (private-includes): Follow-up to r27245, remove the
  ConflictResolverCallback.Result class header file in favor of the
  ConflictResult class header file.


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

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