diff AUTHORS @ 43140:d3e6cbd3895e

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