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

[Romain Francoise]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Romain Francoise <rfrancoise>   08/10/12 09:17:14

Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/etc/ChangeLog,v
retrieving revision 1.737
retrieving revision 1.738
diff -u -b -r1.737 -r1.738
--- ChangeLog   12 Oct 2008 06:18:14 -0000      1.737
+++ ChangeLog   12 Oct 2008 09:17:13 -0000      1.738
@@ -45,13 +45,11 @@
        * PROBLEMS:
        * MACHINES: Remove VMS info.
 
->>>>>>> 1.736
 2008-07-27  Dan Nicolaescu  <address@hidden>
 
        * PROBLEMS:
        * MACHINES: Remove mentions of Mac Carbon.
 
->>>>>>> 1.727
 2008-07-24  Vinicius Jose Latorre  <address@hidden>
 
        * NEWS: New function `diff-show-trailing-blanks' in diff-mode.el.