diff options
author | K. Handa <handa@gnu.org> | 2015-09-02 18:28:54 +0900 |
---|---|---|
committer | K. Handa <handa@gnu.org> | 2015-09-02 18:28:54 +0900 |
commit | e7b62736aade24620c8ba6fa6bd467d017f16ee0 (patch) | |
tree | d00a2203437a168b2414c6b73afc00a88d90b4b1 /lisp/erc/erc-services.el | |
parent | ae08d073d7e2738580341534adc3c5924dc76860 (diff) | |
parent | 30866274e21c5f0a1c5f60cfe290743e7d482349 (diff) | |
download | emacs-e7b62736aade24620c8ba6fa6bd467d017f16ee0.tar.gz emacs-e7b62736aade24620c8ba6fa6bd467d017f16ee0.tar.bz2 emacs-e7b62736aade24620c8ba6fa6bd467d017f16ee0.zip |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Diffstat (limited to 'lisp/erc/erc-services.el')
-rw-r--r-- | lisp/erc/erc-services.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/erc/erc-services.el b/lisp/erc/erc-services.el index 07a4274dcb6..2d2fa6230c3 100644 --- a/lisp/erc/erc-services.el +++ b/lisp/erc/erc-services.el @@ -172,7 +172,7 @@ You can also use M-x erc-nickserv-identify-mode to change modes." Example of use: (setq erc-nickserv-passwords - '((freenode ((\"nick-one\" . \"password\") + \\='((freenode ((\"nick-one\" . \"password\") (\"nick-two\" . \"password\"))) (DALnet ((\"nick\" . \"password\")))))" :group 'erc-services |