From: Michal Ludvig Date: Wed, 22 May 2002 12:56:58 +0000 (+0000) Subject: Removed forgotten conflict indicators X-Git-Tag: gdb_5_2_1-2002-07-23-release~85 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d3c325a0094ea21f1ac45df7ae307cc8faf70e89;p=thirdparty%2Fbinutils-gdb.git Removed forgotten conflict indicators --- diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 3cba45564f4..26f314ddc05 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -48,7 +48,6 @@ * x86-64-tdep.c (x86_64_skip_prologue): Print note when debugging code without frame pointers. ->>>>>>> 1.2298.2.45 2002-04-25 Andrew Cagney * README: Update to GDB 5.2.