From 977c9661d3005d3d6562f94add078fcb96de523f Mon Sep 17 00:00:00 2001
From: Chong Yidong <cyd@stupidchicken.com>
Date: Mon, 6 Mar 2006 20:27:28 +0000
Subject: [PATCH] Typo.

---
 lisp/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ac8adc89ea5..788c2b83c47 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -9,7 +9,6 @@
 	* complete.el (PC-expand-many-files): Try be more careful when parsing
 	the shell's output.
 
->>>>>>> 1.9228
 2006-03-05  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* outline.el (hide-sublevels): Provide better interactive default.
-- 
2.39.2