# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1121741900 0
# Node ID 7597b4a23c3b45b5238177b18f2eb185f46be741
# Parent  fbb2bea03df9eedb3dc4c62658958d7f617ce6f2
*** empty log message ***

diff -r fbb2bea03df9 -r 7597b4a23c3b src/ChangeLog.unicode
--- a/src/ChangeLog.unicode	Thu Jul 14 08:02:00 2005 +0000
+++ b/src/ChangeLog.unicode	Tue Jul 19 02:58:20 2005 +0000
@@ -1054,7 +1054,6 @@
 	* window.c (Fdisplay_buffer, Fframe_selected_window): Remove
 	unsued vars.
 
->>>>>>> 1.1.2.8
 2003-09-26  Dave Love  <fx@gnu.org>
 
 	* xterm.c (x_bitmap_mask): Declare.