Commit f0dd204a authored by Sylvestre Ledru's avatar Sylvestre Ledru

fix merge

parent 01bd6d19
......@@ -128,7 +128,6 @@ bootstrap-fix-include-next.diff
# riscv64
clang-riscv64-multiarch.diff
<<<<<<< HEAD
# Compiler-rt - workaround
workaround-bug-42994-use-linker.diff
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment