diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-06-09 21:10:04 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-06-09 21:10:04 -0400 |
| commit | a71832f78d2fa8128a03aeb551a1ec0895b49f67 (patch) | |
| tree | cfc3957c629d290b3af9e4f71a6b8e89d8bf4c10 /lisp/emacs-lisp/regexp-opt.el | |
| parent | fff84c22e7e57d7364c2298aebf1b35796fc852b (diff) | |
| download | emacs-a71832f78d2fa8128a03aeb551a1ec0895b49f67.tar.gz emacs-a71832f78d2fa8128a03aeb551a1ec0895b49f67.tar.bz2 emacs-a71832f78d2fa8128a03aeb551a1ec0895b49f67.zip | |
* lisp/net/rcirc.el (rcirc-server-alist, rcirc, rcirc-connect): Resolve
merge conflict, giving preference to the emacs-23 version of the code.
Diffstat (limited to 'lisp/emacs-lisp/regexp-opt.el')
0 files changed, 0 insertions, 0 deletions