diff options
| author | Michael Snyder <msnyder@vmware.com> | 2002-04-24 21:22:36 +0000 |
|---|---|---|
| committer | Michael Snyder <msnyder@vmware.com> | 2002-04-24 21:22:36 +0000 |
| commit | 11832e60a3c7c3b4798df6139e8f24f16267031a (patch) | |
| tree | 21e99e22fd8e9f3af2d9e94b50fe200222030e7e | |
| parent | f43845b38ec9ab8ef197a9201b2e9be2913df4b3 (diff) | |
| download | gdb-11832e60a3c7c3b4798df6139e8f24f16267031a.zip gdb-11832e60a3c7c3b4798df6139e8f24f16267031a.tar.gz gdb-11832e60a3c7c3b4798df6139e8f24f16267031a.tar.bz2 | |
clean up cvs merge conflict flags.
| -rw-r--r-- | gdb/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index e7d7325..e488e31 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -67,7 +67,6 @@ Wed Apr 24 14:22:21 2002 Andrew Cagney <cagney@redhat.com> REGISTER_RAW_SIZE of SP_REGNUM not CORE_ADDR. (vx_write_register): Likewise. ->>>>>>> 1.2500 2002-04-23 J. Brobecker <brobecker@gnat.com> * source.c (is_regular_file): New function. |