# HG changeset patch
# User Romain Francoise <romain@orebokech.com>
# Date 1135012558 0
# Node ID 131310d593c052d443353d0c7ef02fed34cea872
# Parent  e7b90ba8a38a41bf62d0c9618a3ff006318f1601
*** empty log message ***

diff -r e7b90ba8a38a -r 131310d593c0 lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Dec 19 15:46:13 2005 +0000
+++ b/lisp/ChangeLog	Mon Dec 19 17:15:58 2005 +0000
@@ -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):