From f0dd204a11c69b775c7f8ed63a379f14094fa19e Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 7 Sep 2019 20:18:41 +0200 Subject: [PATCH] fix merge --- debian/patches/series | 1 - 1 file changed, 1 deletion(-) diff --git a/debian/patches/series b/debian/patches/series index 1a956748..ea5d7b9c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -128,7 +128,6 @@ bootstrap-fix-include-next.diff # riscv64 clang-riscv64-multiarch.diff -<<<<<<< HEAD # Compiler-rt - workaround workaround-bug-42994-use-linker.diff