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

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   07/09/22 01:57:24

Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.11810
retrieving revision 1.11811
diff -u -b -r1.11810 -r1.11811
--- ChangeLog   22 Sep 2007 01:50:54 -0000      1.11810
+++ ChangeLog   22 Sep 2007 01:57:23 -0000      1.11811
@@ -3606,12 +3606,8 @@
 
        * replace.el (match): Use yellow1 instead of yellow.
 
-<<<<<<< ChangeLog
        * progmodes/gdb-ui.el (breakpoint-enabled): Use red1 instead of
        red.
-=======
-       * progmodes/gdb-ui.el (breakpoint-enabled): Use red1 instead of red.
->>>>>>> 1.11807
 
        * pcvs-info.el (cvs-unknown): Likewise.