Bug#1000605: libreoffice: changelog contains git editing noise

[Rene Engelhard <rene@debian.org>]

notfound 1000605 1:7.2.2-1

found 1000605 1:7.2.3-1

Hi,

Am 25.11.21 um 20:15 schrieb Jonas Smedegaard:
> Source: libreoffice
> Version: 1:7.2.2-1

Don't believe so. ITYM 1:7.2.3-1

> Severity: minor

>
> changelog contains the following git editing noise:
>
> >>>>>>>> efaacb77 (actually only set TEST_TIMEOUT if we ignore the
> test results anyway...)
>
Not only that, it contains 7.3 changelog entries, too :/


How on earth did this happen and how did I not notice?


Thanks for pointing that out.


Regards,


Rene