[Clang] Remove conflict markers from ReleaseNotes

Author: cor3ntin

clang/docs/ReleaseNotes.rst

@@ -616,16 +616,13 @@ C++ Language Changes in Clang
   conforming GNU extensions. Projects incompatible with C++17 can add
   ``-std=gnu++14`` to their build settings to restore the previous behaviour.
 - Implemented DR2358 allowing init captures in lambdas in default arguments.
-<<<<<<< HEAD
 - implemented `DR2654 <https://wg21.link/cwg2654>`_ which undeprecates
   all compound assignements operations on volatile qualified variables.
-=======
 - Implemented DR2631. Invalid ``consteval`` calls in default arguments and default
   member initializers are diagnosed when and if the default is used.
   This Fixes `Issue 56379 <https://github.com/llvm/llvm-project/issues/56379>`_
   and changes the value of ``std::source_location::current()``
   used in default parameters calls compared to previous versions of Clang.
->>>>>>> 7c4d4089e1fd (Implement CWG2631)
 
 C++20 Feature Support
 ^^^^^^^^^^^^^^^^^^^^^