Author: Alan Zhao Date: 2023-05-01T10:26:15-07:00 New Revision: f762798599171efca03964f4371cc8104d2392f9
URL: https://github.com/llvm/llvm-project/commit/f762798599171efca03964f4371cc8104d2392f9 DIFF: https://github.com/llvm/llvm-project/commit/f762798599171efca03964f4371cc8104d2392f9.diff LOG: Fix ReleaseNotes.rst unresolved merge conflict Added: Modified: clang/docs/ReleaseNotes.rst Removed: ################################################################################ diff --git a/clang/docs/ReleaseNotes.rst b/clang/docs/ReleaseNotes.rst index ec0dc0adc58b..a3ee06ba1c22 100644 --- a/clang/docs/ReleaseNotes.rst +++ b/clang/docs/ReleaseNotes.rst @@ -373,15 +373,12 @@ Bug Fixes to C++ Support - Fix bug in the computation of the ``__has_unique_object_representations`` builtin for types with unnamed bitfields. (`#61336 <https://github.com/llvm/llvm-project/issues/61336>`_) -<<<<<<< HEAD - Fix default member initializers sometimes being ignored when performing parenthesized aggregate initialization of templated types. (`#62266 <https://github.com/llvm/llvm-project/issues/62266>`_) -======= - Fix overly aggressive lifetime checks for parenthesized aggregate initialization. (`#61567 <https://github.com/llvm/llvm-project/issues/61567>`_) ->>>>>>> c7422b289522 ([clang] Fix overly aggressive lifetime checks for parenthesized aggregate initialization) Bug Fixes to AST Handling ^^^^^^^^^^^^^^^^^^^^^^^^^ _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
