Remove stray conflict marker from changelog. archive/raspbian/14.2.6-1+rpi1 raspbian/14.2.6-1+rpi1
authorPeter Michael Green <plugwash@raspbian.org>
Fri, 17 Jan 2020 02:46:40 +0000 (02:46 +0000)
committerPeter Michael Green <plugwash@raspbian.org>
Fri, 17 Jan 2020 02:46:40 +0000 (02:46 +0000)
commita3902de2ea467c72b90128440a9aa7e148ccb4c6
tree717eb7bb7cf17c8a36bf10ea26e81e983a44b6a2
parentbc3a8249af14a347472ffe7d668dbe635c8e6601
Remove stray conflict marker from changelog.
debian/changelog