diff options
| author | Joakim Verona | 2013-09-11 08:44:18 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-09-11 08:44:18 +0200 |
| commit | 95227d0882184659bfe4e1322a3b9e246e145f0b (patch) | |
| tree | 8bb01cc3621db8ef44658bf197c9ae37c5cd8c00 /lisp | |
| parent | a41d9dcfc950458c081f832606dac2081d14c8ae (diff) | |
| download | emacs-95227d0882184659bfe4e1322a3b9e246e145f0b.tar.gz emacs-95227d0882184659bfe4e1322a3b9e246e145f0b.zip | |
fix conflicts
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ibuffer.el | 2 | ||||
| -rw-r--r-- | lisp/mail/rmail.el | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lisp/ibuffer.el b/lisp/ibuffer.el index 8356a186f13..cde6e2e3d43 100644 --- a/lisp/ibuffer.el +++ b/lisp/ibuffer.el | |||
| @@ -2628,7 +2628,7 @@ will be inserted before the group at point." | |||
| 2628 | 2628 | ||
| 2629 | ;;; Start of automatically extracted autoloads. | 2629 | ;;; Start of automatically extracted autoloads. |
| 2630 | 2630 | ||
| 2631 | ;;;### (autoloads nil "ibuf-ext" "ibuf-ext.el" "85795a4045d20654599b73b88e8e1bc9") | 2631 | ;;;### (autoloads nil "ibuf-ext" "ibuf-ext.el" "d06b2735a74954e0c6922a811de7608c") |
| 2632 | ;;; Generated autoloads from ibuf-ext.el | 2632 | ;;; Generated autoloads from ibuf-ext.el |
| 2633 | 2633 | ||
| 2634 | (autoload 'ibuffer-auto-mode "ibuf-ext" "\ | 2634 | (autoload 'ibuffer-auto-mode "ibuf-ext" "\ |
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el index aa244ddae81..bb4801a523d 100644 --- a/lisp/mail/rmail.el +++ b/lisp/mail/rmail.el | |||
| @@ -4768,7 +4768,7 @@ If prefix argument REVERSE is non-nil, sorts in reverse order. | |||
| 4768 | 4768 | ||
| 4769 | ;;;*** | 4769 | ;;;*** |
| 4770 | 4770 | ||
| 4771 | ;;;### (autoloads nil "rmailsum" "rmailsum.el" "a9b3bbd9b82dd566524a1209b5cdb7dd") | 4771 | ;;;### (autoloads nil "rmailsum" "rmailsum.el" "9005bd5da3e21d1cc173e86fd9fec3c9") |
| 4772 | ;;; Generated autoloads from rmailsum.el | 4772 | ;;; Generated autoloads from rmailsum.el |
| 4773 | 4773 | ||
| 4774 | (autoload 'rmail-summary "rmailsum" "\ | 4774 | (autoload 'rmail-summary "rmailsum" "\ |