diff options
Diffstat (limited to 'gdb/i386-tdep.c')
| -rw-r--r-- | gdb/i386-tdep.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c index 4b2471f..3ddb2ff 100644 --- a/gdb/i386-tdep.c +++ b/gdb/i386-tdep.c @@ -22,12 +22,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "inferior.h" #include "gdbcore.h" #include "target.h" -<<<<<<< i386-tdep.c #include "floatformat.h" -||||||| 1.26 -======= #include "symtab.h" ->>>>>>> 1.27 static long i386_get_frame_setup PARAMS ((int)); |