From e03dd055542c67176307db28fcab544b291af110 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 5 Dec 2023 07:45:54 +0100 Subject: [PATCH] fix changelog --- debian/changelog | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/debian/changelog b/debian/changelog index e4cd45c5..f4dcf507 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,5 @@ llvm-toolchain-17 (1:17.0.6-2) UNRELEASED; urgency=medium -<<<<<<< [ Gianfranco Costamagna ] * Add new cmake-clang-test to spot issues such as Debian bug #1057151 @@ -8,19 +7,8 @@ llvm-toolchain-17 (1:17.0.6-2) UNRELEASED; urgency=medium [ Matthias Klose ] * Also use the free swap to determine the number of parallel processes. - * Set the cpu defaults for the ARM32 architectures: - - armel: arm9e. Closes: #1056115. - - armhf: cortex-a7. * libclang1-17: Hard-code the last full versions for the symlinks. -======= - [ Gianfranco Costamagna ] - * Add new cmake-clang-test to spot issues such as - Debian bug #1057151 - * Fix cmake file (Closes: #1057151) - - [ Matthias Klose ] * Also use the free swap to determine the number of parallel processes. ->>>>>>> -- Gianfranco Costamagna Fri, 01 Dec 2023 10:50:00 +0100