[Emacs-diffs] emacs/lisp ChangeLog

[Alan Mackenzie]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Alan Mackenzie <acmacm> 09/12/03 15:56:32

Modified files:
        lisp           : ChangeLog 

Log message:
        Correct conflicts in previous patch.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16813&r2=1.16814

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16813
retrieving revision 1.16814
diff -u -b -r1.16813 -r1.16814
--- ChangeLog   3 Dec 2009 15:52:37 -0000       1.16813
+++ ChangeLog   3 Dec 2009 15:56:29 -0000       1.16814
@@ -927,14 +927,6 @@
        * progmodes/cc-menus.el (cc-imenu-java-generic-expression):
        Correct the patch from 2009-11-18.  (Bug#3910)
 
-<<<<<<< ChangeLog
-=======
-2009-11-21  Alan Mackenzie  <address@hidden>
-
-       * progmodes/cc-menus.el (cc-imenu-java-generic-expression):
-       Update to deal with modern Java constructs.
-
->>>>>>> 1.16811
 2009-11-21  Tassilo Horn  <address@hidden>
 
        * progmodes/subword.el: Rename from lisp/subword.el.