diff options
| author | Michael Snyder <msnyder@vmware.com> | 1997-06-13 22:41:14 +0000 |
|---|---|---|
| committer | Michael Snyder <msnyder@vmware.com> | 1997-06-13 22:41:14 +0000 |
| commit | 90154aff574da0f2497ef2fceda7bb4a5715e5a8 (patch) | |
| tree | 56310e1f073cba02ddeb0f58dc0199a4082ec627 /gdb | |
| parent | 00e40d11f4eca7468ca7cfe1eab84715544da482 (diff) | |
| download | gdb-90154aff574da0f2497ef2fceda7bb4a5715e5a8.zip gdb-90154aff574da0f2497ef2fceda7bb4a5715e5a8.tar.gz gdb-90154aff574da0f2497ef2fceda7bb4a5715e5a8.tar.bz2 | |
* fix earlier checkin error
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/config/mips/tm-tx39.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/gdb/config/mips/tm-tx39.h b/gdb/config/mips/tm-tx39.h index ce387d8..998470f 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 |