From: Chong Yidong <cyd@stupidchicken.com>
Date: Fri, 17 Jul 2009 01:32:50 +0000 (+0000)
Subject: Fix last change.
X-Git-Tag: emacs-pretest-23.1.90~2139
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=806f1b46a3d173d3e28da063fbe8b15d555f9df0;p=emacs.git

Fix last change.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 11189fc2d48..74468560362 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,4 +1,3 @@
-<<<<<<< ChangeLog
 2009-07-17  Kenichi Handa  <handa@m17n.org>
 
 	* casetab.c (shuffle): Fix the logic of setting up the cycle.