fix conflict

This commit is contained in:
Sylvestre Ledru 2020-09-23 09:09:24 +02:00
parent dc71345f0b
commit 4a85abfb98

4
debian/changelog vendored
View File

@ -1,10 +1,6 @@
llvm-toolchain-11 (1:11.0.0~+rc3-1) unstable; urgency=medium
<<<<<<<
* New snapshot release
=======
* New rc release
>>>>>>>
-- Sylvestre Ledru <sylvestre@debian.org> Tue, 22 Sep 2020 17:19:40 +0200