From: John Paul Wallington <jpw@pobox.com>
Date: Wed, 14 Dec 2005 22:59:35 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-22.0.90~5271
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=eb2def1bc68f04e7feebe8e5d45503d8d807f5b0;p=emacs.git

*** empty log message ***
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 369846e302d..1010b03814c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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,