diff options
| author | Jeff Johnston <jjohnstn@redhat.com> | 2004-02-23 19:26:45 +0000 |
|---|---|---|
| committer | Jeff Johnston <jjohnstn@redhat.com> | 2004-02-23 19:26:45 +0000 |
| commit | 3457d66e5b39f21ab507d9c505127352163f6f0c (patch) | |
| tree | 783912ae9381529c8e51cda23f6daaae4245b568 | |
| parent | cbdeadcaa3b68c48146dd26b5c812d2439cfb0ec (diff) | |
| download | gdb-3457d66e5b39f21ab507d9c505127352163f6f0c.zip gdb-3457d66e5b39f21ab507d9c505127352163f6f0c.tar.gz gdb-3457d66e5b39f21ab507d9c505127352163f6f0c.tar.bz2 | |
Remove conflict indicators.
| -rw-r--r-- | gdb/ChangeLog | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 3c0a192..03a855f 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -309,7 +309,6 @@ * sh-tdep.c (sh_analyze_prologue): Eliminate useless test of cache->uses_fp prior to setting it. ->>>>>>> 1.5450 2004-02-19 Fred Fish <fnf@redhat.com> Fix for PR breakpoint/1558. @@ -326,7 +325,6 @@ type being greater than sizeof of host's LONGEST. Always use unpack_long() unless format 'f' chosen. ->>>>>>> 1.5419 2004-02-19 Joel Brobecker <brobecker@gnat.com> Committed by Elena Zannoni <ezannoni@redhat.com> |