Bug#941762: lintian in Stretch backports contains leftover from merge

[Thorsten Alteholz <debian@alteholz.de>]

Package: lintian
Version: 2.24.0~bpo9+2
Severity: serious
thanks

Hi Chris,

the lintian version in Stretch backports seems to be broken:
 debian@devel:~/tmp/lintian$ grep -R "<<<<"
 lintian-2.24.0~bpo9+2/checks/fields.pm:<<<<<<< HEAD
 lintian-2.24.0~bpo9+2/checks/fields.pm:<<<<<<< HEAD
 lintian-2.24.0~bpo9+2/checks/fields.pm:<<<<<<< HEAD
 debian@devel:~/tmp/lintian$ grep -R ">>>>"
 lintian-2.24.0~bpo9+2/checks/fields.pm:>>>>>>> 2.22.0
 lintian-2.24.0~bpo9+2/checks/fields.pm:>>>>>>> 2.24.0
 lintian-2.24.0~bpo9+2/checks/fields.pm:>>>>>>> 2.24.0

  Thorsten