* tm.texi: Remove merge conflicts.
authorNeil Booth <neil@gcc.gnu.org>
Wed, 27 Jun 2001 19:33:17 +0000 (19:33 +0000)
committerNeil Booth <neil@gcc.gnu.org>
Wed, 27 Jun 2001 19:33:17 +0000 (19:33 +0000)
commitaf27aff6ae1dbbe73ecf2b24dac6b0b1587413b5
tree6c1d959bb4b326a5e7aee4d0efb9f352a9a0d592
parent6b67c26e611e8546402d9b963398fad166439822
* tm.texi: Remove merge conflicts.

From-SVN: r43617
gcc/doc/tm.texi