RelNoteson commit Merge branch 'jk/error-resolve-conflict-advice' (d0d5ba7)
   1Documentation/RelNotes/2.1.0.txt