diff options
| author | Dan Nicolaescu | 2007-09-22 01:57:23 +0000 |
|---|---|---|
| committer | Dan Nicolaescu | 2007-09-22 01:57:23 +0000 |
| commit | e644166a78f32b7bf3e22852d675883fb1755045 (patch) | |
| tree | 9ccaef890f88618e951bff7549614cfca9e9df0c | |
| parent | 3e51f3086787e2fcc4ea7dce111bc9c330897bf7 (diff) | |
| download | emacs-e644166a78f32b7bf3e22852d675883fb1755045.tar.gz emacs-e644166a78f32b7bf3e22852d675883fb1755045.zip | |
Delete conflict markers.
| -rw-r--r-- | lisp/ChangeLog | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c076ffb14ad..25615d3c41f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -3606,12 +3606,8 @@ | |||
| 3606 | 3606 | ||
| 3607 | * replace.el (match): Use yellow1 instead of yellow. | 3607 | * replace.el (match): Use yellow1 instead of yellow. |
| 3608 | 3608 | ||
| 3609 | <<<<<<< ChangeLog | ||
| 3610 | * progmodes/gdb-ui.el (breakpoint-enabled): Use red1 instead of | 3609 | * progmodes/gdb-ui.el (breakpoint-enabled): Use red1 instead of |
| 3611 | red. | 3610 | red. |
| 3612 | ======= | ||
| 3613 | * progmodes/gdb-ui.el (breakpoint-enabled): Use red1 instead of red. | ||
| 3614 | >>>>>>> 1.11807 | ||
| 3615 | 3611 | ||
| 3616 | * pcvs-info.el (cvs-unknown): Likewise. | 3612 | * pcvs-info.el (cvs-unknown): Likewise. |
| 3617 | 3613 | ||