# HG changeset patch
# User Alan Mackenzie <acm@muc.de>
# Date 1259855789 0
# Node ID 51d4bdf757c8ad6bc2f7d21e33a67f6833aad777
# Parent  fec9af99689185d42c4c7306a07221ce75d6520e
Correct conflicts in previous patch.

diff -r fec9af996891 -r 51d4bdf757c8 lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Dec 03 15:52:37 2009 +0000
+++ b/lisp/ChangeLog	Thu Dec 03 15:56:29 2009 +0000
@@ -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  <acm@muc.de>
-
-	* progmodes/cc-menus.el (cc-imenu-java-generic-expression):
-	Update to deal with modern Java constructs.
-
->>>>>>> 1.16811
 2009-11-21  Tassilo Horn  <tassilo@member.fsf.org>
 
 	* progmodes/subword.el: Rename from lisp/subword.el.