diff options
| author | Ulrich Müller <ulm@gentoo.org> | 2015-01-18 00:06:13 +0100 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2015-01-18 00:06:13 +0100 |
| commit | 3065125d314a4cb97aa7982e2d06f48759865af7 (patch) | |
| tree | 3a03fa788a77e8317fe9f8c905c62d92af725628 /lisp/emacs-lisp/cl-extra.el | |
| parent | fd5c0bcc3b5e72e6a6b1f91b3257ef9d9d042fd4 (diff) | |
| download | emacs-3065125d314a4cb97aa7982e2d06f48759865af7.tar.gz emacs-3065125d314a4cb97aa7982e2d06f48759865af7.tar.bz2 emacs-3065125d314a4cb97aa7982e2d06f48759865af7.zip | |
Fix mistake in rebase/merge conflict resolution.
Remove lines from lisp/vc/vc-bzr.el again that were accidentally
restored in commit 2015-01-17T09:56:45!ulm@gentoo.org.
(Previously removed in commit 2014-12-01T13:24:27Z!esr@thyrsus.com.)
Diffstat (limited to 'lisp/emacs-lisp/cl-extra.el')
0 files changed, 0 insertions, 0 deletions