Bug#286771: xfree86: debian/changelog contains Subversion conflict markers
Package: xfree86
Version: 4.3.0.dfsg.1-10
Severity: minor
hi,
lines 365-369 of changelog.Debian.gz read like this:
<<<<<<< .working
-- Fabio M. Di Nitto <fabbione@fabbione.net> Thu, 09 Dec 2004 17:14:45 +0100
=======
-- Fabio M. Di Nitto <fabbione@fabbione.net> Thu, 9 Dec 2004 17:14:45 +0100
>>>>>>> .merge-right.r2073
$ md5sum changelog.Debian.gz
9d14873c0219e637209b57ea5ed5c996 changelog.Debian.gz
cheers,
--
Adeodato Simó
EM: asp16 [ykwim] alu.ua.es | PK: DA6AE621
Listening to: Manitoba - Paul's Birthday
Everything you read in newspapers is absolutely true, except for that
rare story of which you happen to have first-hand knowledge.
-- Erwin Knoll
Reply to: