*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index f16f90cd8f078f84d7061a65bdb782fbeb6acc8a..3a449388f8f0cb9521f9238289b6033beeae75ea 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -43,7 +43,6 @@
 
        * mf/feta-beugel.mf (code): backport brace fix from 1.7
 
->>>>>>> 1.482.2.132
 2003-02-26  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * Backport: