[Emacs-diffs] Changes to emacs/lisp/ChangeLog,v

[Jonathan Yavner]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Jonathan Yavner <JYavner>       06/09/29 02:42:40

Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.10133
retrieving revision 1.10134
diff -u -b -r1.10133 -r1.10134
--- ChangeLog   29 Sep 2006 02:40:15 -0000      1.10133
+++ ChangeLog   29 Sep 2006 02:42:39 -0000      1.10134
@@ -82,7 +82,6 @@
        continued lines.
        (line-move-1): Remove flawed test for that case.
 
->>>>>>> 1.10122
 2006-09-24  Ken Manheimer  <address@hidden>
 
        * icomplete.el (icomplete-simple-completing-p): Use the correct