From 90154aff574da0f2497ef2fceda7bb4a5715e5a8 Mon Sep 17 00:00:00 2001 From: Michael Snyder Date: Fri, 13 Jun 1997 22:41:14 +0000 Subject: [PATCH] * fix earlier checkin error --- gdb/config/mips/tm-tx39.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/gdb/config/mips/tm-tx39.h b/gdb/config/mips/tm-tx39.h index ce387d834e..998470fcbf 100644 --- a/gdb/config/mips/tm-tx39.h +++ b/gdb/config/mips/tm-tx39.h @@ -24,7 +24,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #undef DEFAULT_MIPS_TYPE #define DEFAULT_MIPS_TYPE "r3051" -<<<<<<< tm-tx39.h /* start-sanitize-gm */ #ifdef GENERAL_MAGIC @@ -63,5 +62,3 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #undef USE_STRUCT_CONVENTION #define USE_STRUCT_CONVENTION(gcc_p, type) (TYPE_LENGTH (type) > 8) -======= ->>>>>>> 1.1.2.2