diff etc/gnu.xpm @ 43140:d3e6cbd3895e

Remove traces of merge conflicts.
author Eli Zaretskii <eliz@gnu.org>
date Wed, 06 Feb 2002 16:24:25 +0000
parents e96ffe544684
children 23a1cea22d13
line wrap: on
line diff