From 2444ac6de86b318763f0cc8b1de5fb757cb09170 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sat, 15 Nov 2014 23:22:34 -0800 Subject: [PATCH] Fix ChangeLog typos. --- ChangeLog | 2 +- lisp/ChangeLog | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 885be446e8b..ed978752162 100644 --- a/ChangeLog +++ b/ChangeLog @@ -57,7 +57,7 @@ The last CVS commit was 2009-12-27T08:11:12Z!cyd@stupidchicken.com.) Committer/author email addresses are generally correct for the - transition day, not necessarily when the comit was originally made. + transition day, not necessarily when the commit was originally made. 2014-11-10 Glenn Morris diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1c49034665c..cc749c8755d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -22,7 +22,6 @@ * mail/emacsbug.el (report-emacs-bug): Make a better guess at envelope-from when reporting through sendmail (bug#19054). ->>>>>>> 1a713024a012f574d16084cf42703e6ef49473cf 2014-11-16 Oscar Fuentes -- 2.39.5