Accidental commit, reverted in r26907.
Accidental commit, reverted in r26907.

* subversion/svn/conflict-callbacks.c
  Bogus.

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