Mercurial > emacs

diff etc/ChangeLog @ 98651:28e7a63d1369

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Delete leftover conflict markers.
author Romain Francoise <romain@orebokech.com>
date Sun, 12 Oct 2008 09:17:13 +0000
parents 31250b733501
children 09f1342109b9
line wrap: on
line diff
--- a/etc/ChangeLog	Sun Oct 12 06:22:56 2008 +0000
+++ b/etc/ChangeLog	Sun Oct 12 09:17:13 2008 +0000
@@ -45,13 +45,11 @@
 	* PROBLEMS:
 	* MACHINES: Remove VMS info.
 
->>>>>>> 1.736
 2008-07-27  Dan Nicolaescu  <dann@ics.uci.edu>
 
 	* PROBLEMS:
 	* MACHINES: Remove mentions of Mac Carbon.
 
->>>>>>> 1.727
 2008-07-24  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
 
 	* NEWS: New function `diff-show-trailing-blanks' in diff-mode.el.