Hi, Am Donnerstag, dem 02.09.2021 um 22:29 +0100 schrieb Adam D. Barratt: > 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 <apo@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. Let's fix that in a future upload. Thanks for spotting it. I have removed the marker in Git already. Regards, Markus
Attachment:
signature.asc
Description: This is a digitally signed message part