[Emacs-diffs] Changes to emacs/src/ChangeLog,v

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   08/09/19 01:36:00

Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/src/ChangeLog,v
retrieving revision 1.6979
retrieving revision 1.6980
diff -u -b -r1.6979 -r1.6980
--- ChangeLog   19 Sep 2008 00:35:42 -0000      1.6979
+++ ChangeLog   19 Sep 2008 01:35:59 -0000      1.6980
@@ -45,7 +45,6 @@
        * xmenu.c (menu_position_func): Use x_display_pixel_height and
        x_display_pixel_width.
 
->>>>>>> 1.6978
 2008-09-18  Kenichi Handa  <address@hidden>
 
        * composite.c (fill_gstring_header): Don't check FROM and TO here.
@@ -151,7 +150,6 @@
        * indent.c (Fvertical_motion): Be sure to set
        it_overshoot_expected if it.cmp_it.id is non-nengative.
 
->>>>>>> 1.6977
 2008-09-07  Andreas Schwab  <address@hidden>
 
        * callproc.c (Fcall_process): Don't hold references to string data