projects
/
platform
/
upstream
/
llvm.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
daced85
)
Remove a merge conflict marker that was missed; NFC
author
Aaron Ballman
<aaron@aaronballman.com>
Mon, 21 Aug 2023 11:47:02 +0000
(07:47 -0400)
committer
Tobias Hieta
<tobias@hieta.se>
Tue, 22 Aug 2023 05:48:14 +0000
(07:48 +0200)
clang/docs/ReleaseNotes.rst
patch
|
blob
|
history
diff --git
a/clang/docs/ReleaseNotes.rst
b/clang/docs/ReleaseNotes.rst
index
bb34988
..
ccc78e3
100644
(file)
--- 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