Mercurial > emacs
diff lisp/emacs-lisp/rx.el @ 70111:9f68cc95e2da
Remove conflict marker.
author | Romain Francoise <romain@orebokech.com> |
---|---|
date | Wed, 19 Apr 2006 06:29:47 +0000 |
parents | a080fc579e98 |
children | 7a3f13e2dd57 a7364c1a561e |
author | Romain Francoise <romain@orebokech.com> |
---|---|
date | Wed, 19 Apr 2006 06:29:47 +0000 |
parents | a080fc579e98 |
children | 7a3f13e2dd57 a7364c1a561e |