* notes/interactive-conflict-resolution.txt:   Typo fix.
* notes/interactive-conflict-resolution.txt:
  Typo fix.

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