[clang] 7aa89ee - Remove accidental merge conflict marker; NFC

[Aaron Ballman via cfe-commits]

Author: Aaron Ballman
Date: 2023-10-20T13:28:18-04:00
New Revision: 7aa89ee8be7250d05e4bdc7ea022589cd0f14ecf

URL: https://github.com/llvm/llvm-project/commit/7aa89ee8be7250d05e4bdc7ea022589cd0f14ecf
DIFF: https://github.com/llvm/llvm-project/commit/7aa89ee8be7250d05e4bdc7ea022589cd0f14ecf.diff

LOG: Remove accidental merge conflict marker; NFC

Added: 
    

Modified: 
    clang/docs/ReleaseNotes.rst

Removed: 
    


################################################################################
diff  --git a/clang/docs/ReleaseNotes.rst b/clang/docs/ReleaseNotes.rst
index de7b449eb37862e..3a9a67f7451c092 100644
--- a/clang/docs/ReleaseNotes.rst
+++ b/clang/docs/ReleaseNotes.rst
@@ -306,7 +306,6 @@ Improvements to Clang's diagnostics
 - Clang now displays an improved diagnostic and a note when a defaulted special
   member is marked ``constexpr`` in a class with a virtual base class
   (`#64843: <https://github.com/llvm/llvm-project/issues/64843>`_).
-<<<<<<< ours
 - ``-Wfixed-enum-extension`` and ``-Wmicrosoft-fixed-enum`` diagnostics are no longer
   emitted when building as C23, since C23 standardizes support for enums with a
   fixed underlying type.