fix merge

This commit is contained in:
Sylvestre Ledru 2019-09-07 20:18:41 +02:00
parent 01bd6d191d
commit f0dd204a11

View File

@ -128,7 +128,6 @@ bootstrap-fix-include-next.diff
# riscv64
clang-riscv64-multiarch.diff
<<<<<<< HEAD
# Compiler-rt - workaround
workaround-bug-42994-use-linker.diff