[llvm] 5b0788f - Remove left over merge marker from 4b1e3d19370694dd2b2c04a5945f3f9e43917456

[Tom Stellard via llvm-commits]

Author: Tom Stellard
Date: 2022-07-14T14:51:44-07:00
New Revision: 5b0788fef86ed7008a11f6ee19b9d86d42b6fcfa

URL: https://github.com/llvm/llvm-project/commit/5b0788fef86ed7008a11f6ee19b9d86d42b6fcfa
DIFF: https://github.com/llvm/llvm-project/commit/5b0788fef86ed7008a11f6ee19b9d86d42b6fcfa.diff

LOG: Remove left over merge marker from 4b1e3d19370694dd2b2c04a5945f3f9e43917456

Added: 
    

Modified: 
    llvm/docs/ReleaseNotes.rst

Removed: 
    


################################################################################
diff  --git a/llvm/docs/ReleaseNotes.rst b/llvm/docs/ReleaseNotes.rst
index 3f83671c6c6b..f29a7aaba587 100644
--- a/llvm/docs/ReleaseNotes.rst
+++ b/llvm/docs/ReleaseNotes.rst
@@ -253,7 +253,6 @@ Changes to the LLVM tools
   ``--add-section=.foo1=... --rename-section=.foo1=.foo2`` now adds ``.foo1`` instead of ``.foo2``.
 * The LLVM gold plugin now ignores bitcode from the ``.llvmbc`` section of ELF
   files when doing LTO.  https://github.com/llvm/llvm-project/issues/47216
->>>>>>> bbd6f1cd6d16... [gold] Ignore bitcode from sections inside object files
 
 Changes to LLDB
 ---------------------------------