Fix conflict

This commit is contained in:
Sylvestre Ledru 2020-07-08 14:39:30 +02:00
parent 585bc22dec
commit 2910130b0a

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
llvm-toolchain-snapshot (1:11~++20200702111259+07bda98b6af-1~exp1) UNRELEASED; urgency=medium
* experimental New snapshot release
-- Sylvestre Ledru <sylvestre@debian.org> Thu, 02 Jul 2020 11:16:03 +0200
llvm-toolchain-snapshot (1:11~++20200701093119+ffee8040534-1~exp2) UNRELEASED; urgency=medium
* debian/patches/hurd/hurd-EIEIO-undef.diff: Remove, upstreamed.