X Strike Force XFree86 SVN commit: r2122 - branches/4.3.0/sid/debian
Author: branden
Date: 2005-01-10 13:03:08 -0500 (Mon, 10 Jan 2005)
New Revision: 2122
Modified:
branches/4.3.0/sid/debian/changelog
Log:
Remove conflict markers.
[Fabio, you might consider using Vim with syntax highlighting enabled; it
renders the conflict markers in white text on a screeching red background.
:) ]
Modified: branches/4.3.0/sid/debian/changelog
===================================================================
--- branches/4.3.0/sid/debian/changelog 2005-01-08 22:52:36 UTC (rev 2121)
+++ branches/4.3.0/sid/debian/changelog 2005-01-10 18:03:08 UTC (rev 2122)
@@ -362,11 +362,7 @@
Thomas Beige. Resolves CAN-2004-0914: memory leak, improper use of signed
integers, and overflows in the Xpm library. Resync offset in patch #200.
-<<<<<<< .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
xfree86 (4.3.0.dfsg.1-8) unstable; urgency=high
Reply to: