diff man/xresources.texi @ 46515:272c43ada087

Remove conflict marker.
author Andreas Schwab <schwab@suse.de>
date Thu, 18 Jul 2002 09:42:56 +0000
parents 7bcd2de62c44
children b18665979968
line wrap: on
line diff