From 1c762894a4e63c30a95cb03cdcad321588ba4f3b Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 20 Jun 2014 09:27:45 +0000 Subject: [PATCH] Fix conflicts --- debian/changelog | 5 ----- 1 file changed, 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index fdee679d..56969081 100644 --- a/debian/changelog +++ b/debian/changelog @@ -95,7 +95,6 @@ llvm-toolchain-3.4 (1:3.4.1-1) unstable; urgency=medium * New upstream release. Note that only LLVM & Clang had a new release. I just copied the 3.4 tarballs for clang-extra-tools, polly, lldb and compiler-rt. ->>>>>>> .merge-right.r1206 * Symlink for current build mode missing (Closes upstream #18836) * Add link usr/lib/llvm-3.4/ to usr/lib/llvm-3.4/build/Debug+Asserts * Backport of a r201586 from upstream. scan-build was failing on some project @@ -122,11 +121,7 @@ llvm-toolchain-3.4 (1:3.4.1-1) unstable; urgency=medium - clang-tidy - clang-3.4 - pp-trace - clang-3.4 -<<<<<<< .working - -- Sylvestre Ledru Mon, 17 Feb 2014 13:55:34 +0100 -======= -- Sylvestre Ledru Fri, 09 May 2014 19:57:33 +0200 ->>>>>>> .merge-right.r1206 llvm-toolchain-snapshot (1:3.5~svn200375-1) unstable; urgency=medium