On Sat, 2021-08-28 at 22:52 +0200, Markus Koschany wrote: > Fixing CVE-2021-36773 in Buster and updating various filter lists. >
The changelog appears to include a conflict marker: +ublock-origin (1.32.0+dfsg-1) unstable; urgency=medium + + * New upstream version 1.32.0+dfsg. + * Declare compliance with Debian Policy 4.5.1. + + -- Markus Koschany <a...@debian.org> Sat, 26 Dec 2020 20:48:03 +0100 +>>>>>>> master It's up to you if you'd prefer that I reject the current upload so you can clean up and re-upload, or fix it in a presumed future upload. Regards, Adam
