# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1141676848 0
# Node ID 86ebde8d0adca3cd1b000124efc3a62abda57422
# Parent  270a2959d019a6dc771cdc6ef45610160c295d78
Typo.

diff -r 270a2959d019 -r 86ebde8d0adc lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Mar 06 20:27:06 2006 +0000
+++ b/lisp/ChangeLog	Mon Mar 06 20:27:28 2006 +0000
@@ -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.