================
@@ -145,8 +145,75 @@ New checks
 - New :doc:`readability-ambiguous-smartptr-reset-call
   <clang-tidy/checks/readability/ambiguous-smartptr-reset-call>` check.
 
+<<<<<<< HEAD
----------------
EugeneZelenko wrote:

Rebase artifact.

https://github.com/llvm/llvm-project/pull/139525
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

Reply via email to