* fix earlier checkin error

diff --git a/gdb/config/mips/tm-tx39.h b/gdb/config/mips/tm-tx39.h
index ce387d834e00f0b236daa35723d55dcb3eeb8d6f..998470fcbf39d0579da470324edd662d6823cf4d 100644 (file)
--- 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