From fa020b2d6ac7289194f85d7e8dee716649e84667 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 2 Sep 2014 12:30:09 +0000 Subject: [PATCH] fix the list of patches --- debian/patches/series | 6 ------ 1 file changed, 6 deletions(-) diff --git a/debian/patches/series b/debian/patches/series index 609d02e7..d669496a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -24,12 +24,6 @@ atomic_library_2.diff python-clangpath.diff removeduplicatedeclaration.diff fix-clang-path-and-build.diff -<<<<<<< .working -#include-target.diff -======= -silent-MCJIIT-tests.diff -#include-target.diff ->>>>>>> .merge-right.r1379 force-gcc-header-obj.diff do-not-fail-on-unexpected-pass.diff silent-more-tests.diff