Remove a merge conflict marker that was missed; NFC
authorAaron Ballman <aaron@aaronballman.com>
Mon, 21 Aug 2023 11:47:02 +0000 (07:47 -0400)
committerTobias Hieta <tobias@hieta.se>
Tue, 22 Aug 2023 05:48:14 +0000 (07:48 +0200)
commit7fdfe24a39c3ea8d268a1e48ec84fbc52cb10bc7
tree7fb569c5d9626b25c1e4d3e032f7041085fd33d3
parentdaced851f0a659e4934d00fc7920e8c787379c7d
Remove a merge conflict marker that was missed; NFC
clang/docs/ReleaseNotes.rst