Mercurial > emacs
changeset 106394:51d4bdf757c8
Correct conflicts in previous patch.
| author | Alan Mackenzie <acm@muc.de> |
|---|---|
| date | Thu, 03 Dec 2009 15:56:29 +0000 |
| parents | fec9af996891 |
| children | f2b36fb84bf7 |
| files | lisp/ChangeLog |
| diffstat | 1 files changed, 0 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- 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.