comparison etc/ChangeLog @ 98651:28e7a63d1369

Delete leftover conflict markers.
author Romain Francoise <romain@orebokech.com>
date Sun, 12 Oct 2008 09:17:13 +0000
parents 31250b733501
children 09f1342109b9
comparison
equal deleted inserted replaced
98650:7581dc5f5f96 98651:28e7a63d1369
43 * termcap.src: Remove file. 43 * termcap.src: Remove file.
44 * README: 44 * README:
45 * PROBLEMS: 45 * PROBLEMS:
46 * MACHINES: Remove VMS info. 46 * MACHINES: Remove VMS info.
47 47
48 >>>>>>> 1.736
49 2008-07-27 Dan Nicolaescu <dann@ics.uci.edu> 48 2008-07-27 Dan Nicolaescu <dann@ics.uci.edu>
50 49
51 * PROBLEMS: 50 * PROBLEMS:
52 * MACHINES: Remove mentions of Mac Carbon. 51 * MACHINES: Remove mentions of Mac Carbon.
53 52
54 >>>>>>> 1.727
55 2008-07-24 Vinicius Jose Latorre <viniciusjl@ig.com.br> 53 2008-07-24 Vinicius Jose Latorre <viniciusjl@ig.com.br>
56 54
57 * NEWS: New function `diff-show-trailing-blanks' in diff-mode.el. 55 * NEWS: New function `diff-show-trailing-blanks' in diff-mode.el.
58 56
59 2008-07-24 Michael Albinus <michael.albinus@gmx.de> 57 2008-07-24 Michael Albinus <michael.albinus@gmx.de>