Mercurial > emacs
diff lisp/erc/erc-button.el @ 70883:910efa724a98
Remove conflict indicators.
author | Chong Yidong <cyd@stupidchicken.com> |
---|---|
date | Wed, 24 May 2006 14:25:50 +0000 |
parents | a90c92cb9783 |
children | 7a3f13e2dd57 |
author | Chong Yidong <cyd@stupidchicken.com> |
---|---|
date | Wed, 24 May 2006 14:25:50 +0000 |
parents | a90c92cb9783 |
children | 7a3f13e2dd57 |