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