Remove stray merge marker from changelog.
authorPeter Michael Green <plugwash@raspbian.org>
Thu, 23 Jan 2020 16:49:43 +0000 (16:49 +0000)
committerPeter Michael Green <plugwash@raspbian.org>
Sat, 25 Jan 2020 04:14:12 +0000 (04:14 +0000)
commit751fe717c4d7eb3df0e3bc8ba62fe9805781201b
treedce28f50079a8a97010164ca8fb96f017fef2c81
parente64c47ab3f0613444a7c3a0dc07970d44859bd1b
Remove stray merge marker from changelog.
debian/changelog