Merge conflict in sarges X changelog.Debian.gz
silverboxy:~# zgrep -n -C 2
=== /usr/share/doc/xfree86-common/changelog.Debian.gz
365-<<<<<<< .working
366- -- Fabio M. Di Nitto <fabbione@fabbione.net> Thu, 09 Dec 2004 17:14:45
+0100
367:=======
368- -- Fabio M. Di Nitto <fabbione@fabbione.net> Thu, 9 Dec 2004 17:14:45
+0100
369->>>>>>> .merge-right.r2073
silverboxy:~# dpkg -s xfree86-common
Package: xfree86-common
Status: install ok installed
Priority: optional
Section: x11
Installed-Size: 1252
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Architecture: all
Source: xfree86
Version: 4.3.0.dfsg.1-10
--
Rainer Dorsch
Alzentalstr. 28
D-71083 Herrenberg
07032-919495
Icq: 32550367
Reply to: