fixup! [clang-tidy] New option to remove arguments from the command line

Improved Release Notes

Author: felix642

clang-tools-extra/docs/ReleaseNotes.rst

@@ -132,7 +132,12 @@ Improvements to clang-tidy
   when run over C files. If ``-std`` is not specified, it defaults to
   ``c99-or-later``.
 
+<<<<<<< HEAD
 - :program:`clang-tidy` no longer attempts to analyze code from system headers
+=======
+<<<<<<< HEAD
+- :program:`clang-tidy` no longer attemps to analyze code from system headers
+>>>>>>> 64f91e7543e8 (fixup! [clang-tidy] New option to remove arguments from the command line)
   by default, greatly improving performance. This behavior is disabled if the
   `SystemHeaders` option is enabled.
 
@@ -167,8 +172,9 @@ Improvements to clang-tidy
   scripts by adding the `-hide-progress` option to suppress progress and
   informational messages.
 
-- Improved :program:`clang-tidy` by adding the option `RemovedArgs`
-  to remove arguments sent to the compiler when invoking clang-tidy.
+- Improved :program:`clang-tidy` by adding the option 
+  :option:`RemovedArgs` to remove arguments sent to the 
+  compiler when invoking clang-tidy.
 
 - Deprecated the :program:`clang-tidy` ``zircon`` module. All checks have been
   moved to the ``fuchsia`` module instead. The ``zircon`` module will be removed