Mercurial > emacs
comparison src/xsmfns.c @ 46515:272c43ada087
Remove conflict marker.
author | Andreas Schwab <schwab@suse.de> |
---|---|
date | Thu, 18 Jul 2002 09:42:56 +0000 |
parents | 40db0673e6f0 |
children | 080b4586492b |
comparison
equal
deleted
inserted
replaced
46514:22964382b73a | 46515:272c43ada087 |
---|