* Makefile.in (CONFLICTS): Fix s/r conflict count to 18.
authorBrendan Kehoe <brendan@lisa.cygnus.com>
Wed, 17 Sep 1997 18:05:58 +0000 (18:05 +0000)
committerBrendan Kehoe <brendan@gcc.gnu.org>
Wed, 17 Sep 1997 18:05:58 +0000 (14:05 -0400)
commit8552680f15eba7e49bf72d9e00fd0c4615e9a07e
tree6cbf26cc218d9cacb201a29ab18067ff6b002d7a
parentbf520cd90b6caf8eceae5bdbeff3da2d3f0a7d73
* Makefile.in (CONFLICTS): Fix s/r conflict count to 18.

From-SVN: r15514
gcc/cp/ChangeLog
gcc/cp/Makefile.in