diff options
| author | Richard Stallman <rms@gnu.org> | 1993-05-06 17:41:52 +0000 |
|---|---|---|
| committer | Richard Stallman <rms@gnu.org> | 1993-05-06 17:41:52 +0000 |
| commit | 074daeb15d17210af4b059cd1911143660ecc009 (patch) | |
| tree | a8ae51d5c1ea57ff5ec2ab76c7c5894091d2cb23 | |
| parent | b54b3fb0235659bb387d9c3d852e1942e1870208 (diff) | |
| download | gcc-074daeb15d17210af4b059cd1911143660ecc009.zip gcc-074daeb15d17210af4b059cd1911143660ecc009.tar.gz gcc-074daeb15d17210af4b059cd1911143660ecc009.tar.bz2 | |
For Objc, expect just 20 conflicts.
From-SVN: r4365
| -rw-r--r-- | gcc/c-parse.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/c-parse.in b/gcc/c-parse.in index 1cab424..c5ff5a9 100644 --- a/gcc/c-parse.in +++ b/gcc/c-parse.in @@ -27,7 +27,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ written by AT&T, but I have never seen it. */ ifobjc -%expect 56 +%expect 20 end ifobjc ifc %expect 8 |