mirror of
https://git.proxmox.com/git/llvm-toolchain
synced 2025-08-08 20:15:05 +00:00
fix conflict
This commit is contained in:
parent
dc71345f0b
commit
4a85abfb98
4
debian/changelog
vendored
4
debian/changelog
vendored
@ -1,10 +1,6 @@
|
|||||||
llvm-toolchain-11 (1:11.0.0~+rc3-1) unstable; urgency=medium
|
llvm-toolchain-11 (1:11.0.0~+rc3-1) unstable; urgency=medium
|
||||||
|
|
||||||
<<<<<<<
|
|
||||||
* New snapshot release
|
|
||||||
=======
|
|
||||||
* New rc release
|
* New rc release
|
||||||
>>>>>>>
|
|
||||||
|
|
||||||
-- Sylvestre Ledru <sylvestre@debian.org> Tue, 22 Sep 2020 17:19:40 +0200
|
-- Sylvestre Ledru <sylvestre@debian.org> Tue, 22 Sep 2020 17:19:40 +0200
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user