[src/trunk]: src/external/gpl3/gdb/dist/bfd remove conflict marker

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ebb11a183698
branches:  trunk
changeset: 456829:ebb11a183698
user:      christos <christos%NetBSD.org@localhost>
date:      Wed May 29 01:38:27 2019 +0000

description:
remove conflict marker

diffstat:

 external/gpl3/gdb/dist/bfd/config.bfd |  1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diffs (11 lines):

diff -r 1630d4e7f90d -r ebb11a183698 external/gpl3/gdb/dist/bfd/config.bfd
--- a/external/gpl3/gdb/dist/bfd/config.bfd     Wed May 29 01:37:55 2019 +0000
+++ b/external/gpl3/gdb/dist/bfd/config.bfd     Wed May 29 01:38:27 2019 +0000
@@ -877,7 +877,6 @@
     targ_selvecs=microblaze_elf32_le_vec
     ;;
 
-<<<<<<< config.bfd
   mips*-big-*)
     targ_defvec=mips_ecoff_be_vec
     targ_selvecs=mips_ecoff_le_vec