================ @@ -327,13 +327,16 @@ Improvements to Clang's diagnostics - Added a missing space to the FixIt for the ``implicit-int`` group of diagnostics and made sure that only one such diagnostic and FixIt is emitted per declaration group. (#GH179354) +<<<<<<< HEAD - Fixed the Fix-It insertion point for ``expected ';' after alias declaration`` when parsing alias declarations involving a token-split ``>>`` sequence (for example, ``using A = X<int>>;``). (#GH184425) - Fixed incorrect ``implicitly deleted`` diagnostic for explicitly deleted candidate function. (#GH185693) +======= +>>>>>>> 62c8a920b9c1 (Added the suggested fix) ---------------- Sirraide wrote:
Looks like a merge has gone wrong w/ in the ReleaseNotes.rst https://github.com/llvm/llvm-project/pull/188904 _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
