Module Name: src
Committed By: christos
Date: Wed May 29 01:38:27 UTC 2019
Modified Files:
src/external/gpl3/gdb/dist/bfd: config.bfd
Log Message:
remove conflict marker
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/external/gpl3/gdb/dist/bfd/config.bfd
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gdb/dist/bfd/config.bfd
diff -u src/external/gpl3/gdb/dist/bfd/config.bfd:1.19 src/external/gpl3/gdb/dist/bfd/config.bfd:1.20
--- src/external/gpl3/gdb/dist/bfd/config.bfd:1.19 Sun May 26 17:40:00 2019
+++ src/external/gpl3/gdb/dist/bfd/config.bfd Tue May 28 21:38:27 2019
@@ -877,7 +877,6 @@ case "${targ}" in
targ_selvecs=microblaze_elf32_le_vec
;;
-<<<<<<< config.bfd
mips*-big-*)
targ_defvec=mips_ecoff_be_vec
targ_selvecs=mips_ecoff_le_vec
