[obvious] Kill left-over merge marker
authorPaul Pluzhnikov <ppluzhnikov@google.com>
Tue, 31 Mar 2009 22:39:27 +0000 (22:39 +0000)
committerPaul Pluzhnikov <ppluzhnikov@google.com>
Tue, 31 Mar 2009 22:39:27 +0000 (22:39 +0000)
commit1b88d5c487d0f28d15eb9d61dc752cfb1b609125
tree257ac0d8ed6604d4af682e6d41b601ac9eb9d1d5
parentf47a1d2eb8ec6e792466dca865b3c3450e7a8e88
[obvious] Kill left-over merge marker
gdb/ChangeLog