# HG changeset patch
# User Jason Rumney <jasonr@gnu.org>
# Date 1097967679 0
# Node ID 1a10f9dbc3ccb28b9e7b08fe94931e6902cfceda
# Parent  150f1a99cbe46d8e18d930351c96564c5f384e4e
*** empty log message ***

diff -r 150f1a99cbe4 -r 1a10f9dbc3cc src/ChangeLog
--- a/src/ChangeLog	Sat Oct 16 23:00:26 2004 +0000
+++ b/src/ChangeLog	Sat Oct 16 23:01:19 2004 +0000
@@ -29,7 +29,6 @@
 
 	* fns.c (map_char_table): Add missing gcpros.
 
->>>>>>> 1.3925
 2004-10-13  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* keymap.c (get_keymap): An autoload form is not a keymap.