diff options
| author | Jeff Johnston <jjohnstn@redhat.com> | 2004-09-01 17:56:39 +0000 |
|---|---|---|
| committer | Jeff Johnston <jjohnstn@redhat.com> | 2004-09-01 17:56:39 +0000 |
| commit | e4a74b90e74d762e2e8079cd354abc6885e996e6 (patch) | |
| tree | 8bad50e63f7f3648f6996430cca81a987955182d /gdb/testsuite | |
| parent | edd9b715ac358e7ed76e076b31b7d95b3c911b97 (diff) | |
| download | gdb-e4a74b90e74d762e2e8079cd354abc6885e996e6.zip gdb-e4a74b90e74d762e2e8079cd354abc6885e996e6.tar.gz gdb-e4a74b90e74d762e2e8079cd354abc6885e996e6.tar.bz2 | |
Remove conflict marker.
Diffstat (limited to 'gdb/testsuite')
| -rw-r--r-- | gdb/testsuite/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 115761a..3817000 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -80,7 +80,6 @@ * gdb.mi/basics.c: Add copyright notice. * gdb.mi/var-cmd.c: Add copyright notice. ->>>>>>> 1.1015 2004-08-23 Michael Chastain <mec.gnu@mindspring.com> * lib/gdb.exp: Remove signed_keyword_not_used. |