Mercurial > emacs
diff lisp/whitespace.el @ 46515:272c43ada087
Remove conflict marker.
author | Andreas Schwab <schwab@suse.de> |
---|---|
date | Thu, 18 Jul 2002 09:42:56 +0000 |
parents | 0ad4d3e3bfe6 |
children | b7a8fec8113c |
author | Andreas Schwab <schwab@suse.de> |
---|---|
date | Thu, 18 Jul 2002 09:42:56 +0000 |
parents | 0ad4d3e3bfe6 |
children | b7a8fec8113c |