diff options
| author | Paul Eggert | 2014-11-15 23:22:34 -0800 |
|---|---|---|
| committer | Paul Eggert | 2014-11-15 23:23:07 -0800 |
| commit | 2444ac6de86b318763f0cc8b1de5fb757cb09170 (patch) | |
| tree | 13d687d4306ec30fa75bd6b19e81a24beb828ce4 | |
| parent | bc5d86fe909e2808194bc738c8086599245f22c5 (diff) | |
| download | emacs-2444ac6de86b318763f0cc8b1de5fb757cb09170.tar.gz emacs-2444ac6de86b318763f0cc8b1de5fb757cb09170.zip | |
Fix ChangeLog typos.
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/ChangeLog | 1 |
2 files changed, 1 insertions, 2 deletions
| @@ -57,7 +57,7 @@ | |||
| 57 | The last CVS commit was 2009-12-27T08:11:12Z!cyd@stupidchicken.com.) | 57 | The last CVS commit was 2009-12-27T08:11:12Z!cyd@stupidchicken.com.) |
| 58 | 58 | ||
| 59 | Committer/author email addresses are generally correct for the | 59 | Committer/author email addresses are generally correct for the |
| 60 | transition day, not necessarily when the comit was originally made. | 60 | transition day, not necessarily when the commit was originally made. |
| 61 | 61 | ||
| 62 | 2014-11-10 Glenn Morris <rgm@gnu.org> | 62 | 2014-11-10 Glenn Morris <rgm@gnu.org> |
| 63 | 63 | ||
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1c49034665c..cc749c8755d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | 22 | ||
| 23 | * mail/emacsbug.el (report-emacs-bug): Make a better guess at | 23 | * mail/emacsbug.el (report-emacs-bug): Make a better guess at |
| 24 | envelope-from when reporting through sendmail (bug#19054). | 24 | envelope-from when reporting through sendmail (bug#19054). |
| 25 | >>>>>>> 1a713024a012f574d16084cf42703e6ef49473cf | ||
| 26 | 25 | ||
| 27 | 2014-11-16 Oscar Fuentes <ofv@wanadoo.es> | 26 | 2014-11-16 Oscar Fuentes <ofv@wanadoo.es> |
| 28 | 27 | ||