Fix ChangeLog typos.

diff --git a/ChangeLog b/ChangeLog
index 885be446e8b07b585323dc2f5236183810f0ed33..ed97875216290d7f1cc66b1a931dbf96e85fb10d 100644 (file)
--- 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  <rgm@gnu.org>
 

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1c49034665ccdf849fd728ac31cae63bb7da13d8..cc749c8755df8cc1b22e51cd05491cf35df6b4e9 100644 (file)
--- 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 <ofv@wanadoo.es>