Commit e644166a authored by Dan Nicolaescu's avatar Dan Nicolaescu
Browse files

Delete conflict markers.

parent 3e51f308
......@@ -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.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment