OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove merge markers

This commit is contained in:
Nick Clifton 2009-03-27 08:26:18 +00:00
parent 88fc996f58
commit c0157db47e
1 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
gas/doc/as.texinfo
View File

@ -2242,15 +2242,12 @@ is considered a comment and is ignored. The line comment character is
@ifset PPC
@samp{#} for Motorola PowerPC;
@end ifset
<<<<<<< as.texinfo
@ifset SCORE
@samp{#} for the Sunplus SCORE;
@end ifset
=======
@ifset S390
@samp{#} for IBM S/390;
@end ifset
>>>>>>> 1.196
@ifset SCORE
@samp{#} for the Sunplus SCORE;
@end ifset
@ifset SH
@samp{!} for the Renesas / SuperH SH;
@end ifset
@ -6765,15 +6762,12 @@ subject, see the hardware manufacturer's manual.
@ifset PPC
* PPC-Dependent:: PowerPC Dependent Features
@end ifset
<<<<<<< as.texinfo
@ifset SCORE
* SCORE-Dependent:: SCORE Dependent Features
@end ifset
=======
@ifset S390
* S/390-Dependent:: IBM S/390 Dependent Features
@end ifset
>>>>>>> 1.196
@ifset SCORE
* SCORE-Dependent:: SCORE Dependent Features
@end ifset
@ifset SPARC
* Sparc-Dependent:: SPARC Dependent Features
@end ifset
@ -6942,17 +6936,14 @@ family.
@include c-ppc.texi
@end ifset
<<<<<<< as.texinfo
@ifset SCORE
@include c-score.texi
@end ifset
=======
@ifset S390
@include c-s390.texi
@end ifset
>>>>>>> 1.196
@ifset SCORE
@include c-score.texi
@end ifset
@ifset SH
@include c-sh.texi
@include c-sh64.texi