comparison etc/NEWS.1-17 @ 87171:4b0ef62e1965

Remove conflict marker.
author David Kastrup <dak@gnu.org>
date Sat, 08 Dec 2007 01:06:12 +0000
parents 40bf41048aad
children 1dd7437446ea
comparison
equal deleted inserted replaced
87170:e50a2e215441 87171:4b0ef62e1965