fix conflict

This commit is contained in:
Sylvestre Ledru 2023-11-22 10:36:34 +01:00
parent 0c09647cd0
commit 19fe78dea0

11
debian/changelog vendored
View File

@ -16,7 +16,6 @@ llvm-toolchain-17 (1:17.0.5-2) UNRELEASED; urgency=medium
llvm-toolchain-17 (1:17.0.5-1) unstable; urgency=medium
<<<<<<<
[ John Paul Adrian Glaubitz ]
* Don't run chrpath for libclang on sparc and sparc64
@ -25,16 +24,6 @@ llvm-toolchain-17 (1:17.0.5-1) unstable; urgency=medium
[ Sylvestre Ledru ]
* New upstream release
=======
[ John Paul Adrian Glaubitz ]
* Don't run chrpath for libclang on sparc and sparc64
[ Matthias Klose ]
* Build-depend on llvm-spirv-17.
[ Sylvestre Ledru ]
* New supstream release
>>>>>>>
-- Sylvestre Ledru <sylvestre@debian.org> Tue, 14 Nov 2023 11:27:22 +0100