comparison src/fontset.c @ 43140:d3e6cbd3895e

Remove traces of merge conflicts.
author Eli Zaretskii <eliz@gnu.org>
date Wed, 06 Feb 2002 16:24:25 +0000
parents 34952771ae85
children 01b93e5e53a7 8ae0d0693ed9
comparison
equal deleted inserted replaced
43139:22ff542d67ee 43140:d3e6cbd3895e