# HG changeset patch
# User John Paul Wallington <jpw@pobox.com>
# Date 1134601175 0
# Node ID c8432466c0f54900b9e8d94321a65800e84ea677
# Parent  d5237ca935dcdfaaef1218607933824b975797cc
*** empty log message ***

diff -r d5237ca935dc -r c8432466c0f5 src/ChangeLog
--- a/src/ChangeLog	Wed Dec 14 22:23:30 2005 +0000
+++ b/src/ChangeLog	Wed Dec 14 22:59:35 2005 +0000
@@ -15,7 +15,6 @@
 
 	* coding.c (code_convert_region_unwind): GCPRO arg.
 
->>>>>>> 1.4762
 2005-12-12  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
 	* xfns.c (compute_tip_xy): Calculate root_y the same way as root_x,