From 40c67c6dee51662ef7c12ca6615e68eaa7ae56ef Mon Sep 17 00:00:00 2001
From: Glenn Morris <rgm@gnu.org>
Date: Wed, 4 May 2011 23:25:24 -0700
Subject: [PATCH] ChangeLog merge fix, grumble.

---
 lisp/ChangeLog | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f1376884e9..7a491bd8fa 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,8 +1,3 @@
-2011-05-05  Daniel Colascione <dan.colascione@gmail.com>
-
-	* progmodes/cc-engine.el (c-forward-decl-or-cast-1): Use
-	correct match group (bug#8438).
-
 2011-05-05  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	Fix earlier half-done eieio-defmethod change (bug#8338).
-- 
2.39.2