comparison src/xrdb.c @ 43140:d3e6cbd3895e

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