Remove left over merge marker from 4b1e3d1937

This commit is contained in:
Tom Stellard 2022-07-14 14:51:44 -07:00
parent 4b1e3d1937
commit 5b0788fef8
1 changed files with 0 additions and 1 deletions

View File

@ -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
---------------------------------