fix merge

This commit is contained in:
Sylvestre Ledru 2022-10-09 20:41:38 +02:00
parent 2c777189ef
commit 7238f734ad

5
debian/changelog vendored
View File

@ -108,13 +108,8 @@ llvm-toolchain-15 (1:15.0.0-1~exp1) experimental; urgency=medium
llvm-toolchain-15 (1:15.0.0~+rc3-1~exp2) experimental; urgency=medium llvm-toolchain-15 (1:15.0.0~+rc3-1~exp2) experimental; urgency=medium
<<<<<<<
* Update of the build dep from llvm-spirv => llvm-spirv-14 * Update of the build dep from llvm-spirv => llvm-spirv-14
as it is now versionned. It should build libclc as it is now versionned. It should build libclc
=======
* Update of the build dep from llvm-spirv => llvm-spirv-14
as it is now versioned. It should build libclc
>>>>>>>
-- Sylvestre Ledru <sylvestre@debian.org> Wed, 31 Aug 2022 17:10:33 +0200 -- Sylvestre Ledru <sylvestre@debian.org> Wed, 31 Aug 2022 17:10:33 +0200