X Strike Force XFree86 SVN commit: rev 851 - trunk/debian
Author: branden
Date: 2003-12-17 13:43:46 -0500 (Wed, 17 Dec 2003)
New Revision: 851
Modified:
trunk/debian/changelog
Log:
(cosmetic) Remove spurious conflict markers from end of file.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2003-12-16 18:36:47 UTC (rev 850)
+++ trunk/debian/changelog 2003-12-17 18:43:46 UTC (rev 851)
@@ -4362,6 +4362,3 @@
$Id$
vim:set ai et sts=2 sw=2 tw=78:
-<<<<<<< .working
-=======
->>>>>>> .merge-right.r742
Reply to: