[Emacs-diffs] [emacs] 01/01: Fix ChangeLog typos.

[Paul Eggert]

eggert pushed a commit to branch master
in repository emacs.

commit 2444ac6de86b318763f0cc8b1de5fb757cb09170
Author: Paul Eggert <address@hidden>
Date:   Sat Nov 15 23:22:34 2014 -0800

    Fix ChangeLog typos.
---
 ChangeLog      |    2 +-
 lisp/ChangeLog |    1 -
 2 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 885be44..ed97875 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -57,7 +57,7 @@
        The last CVS commit was 2009-12-27T08:11:address@hidden)
 
        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  <address@hidden>
 
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1c49034..cc749c8 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 <address@hidden>