Mercurial > emacs
changeset 84775:8589ca45e3b9
Delete conflict markers.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Sat, 22 Sep 2007 01:57:23 +0000 |
| parents | 3c064398f718 |
| children | 8e111156b7d2 |
| files | lisp/ChangeLog |
| diffstat | 1 files changed, 0 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sat Sep 22 01:50:54 2007 +0000 +++ b/lisp/ChangeLog Sat Sep 22 01:57:23 2007 +0000 @@ -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.