[llvm-branch-commits] [clang] 7fdfe24 - Remove a merge conflict marker that was missed; NFC

[Tobias Hieta via llvm-branch-commits]

Author: Aaron Ballman
Date: 2023-08-22T07:48:14+02:00
New Revision: 7fdfe24a39c3ea8d268a1e48ec84fbc52cb10bc7

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

LOG: Remove a merge conflict marker that was missed; NFC

Added: 
    

Modified: 
    clang/docs/ReleaseNotes.rst

Removed: 
    


################################################################################
diff  --git a/clang/docs/ReleaseNotes.rst b/clang/docs/ReleaseNotes.rst
index bb34988c3b612e..ccc78e34e4981f 100644
--- a/clang/docs/ReleaseNotes.rst
+++ b/clang/docs/ReleaseNotes.rst
@@ -477,8 +477,6 @@ Bug Fixes in This Version
   instantiated in one module and whose definition is instantiated in another
   module may end up with members associated with the wrong declaration of the
   class, which can result in miscompiles in some cases.
-<<<<<<< HEAD
-
 - Added a new diagnostic warning group
   ``-Wdeprecated-redundant-constexpr-static-def``, under the existing
   ``-Wdeprecated`` group. This controls warnings about out-of-line definitions