From: Romain Francoise <romain@orebokech.com>
Date: Mon, 19 Dec 2005 17:15:58 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-22.0.90~5188
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=de64bbfaf779ed45f97bb686106bfeed1daa9ef0;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 954ff20d4e8..c0ab0b5471e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -27,7 +27,6 @@
 	* emacs-lisp/cl-extra.el (cl-macroexpand-all): Fix code-walk for
 	lexical-let when encountering ((lambda (...) ...) ...).
 
->>>>>>> 1.8828
 2005-12-17  Chong Yidong  <cyd@stupidchicken.com>
 
 	* progmodes/sh-script.el (sh-mode):