Remove conflict indicator.
commitdf1b07f3b958638590d3a49c8df6d49443369952
authorDevang Patel <dpatel@gcc.gnu.org>
Tue, 22 Apr 2003 19:53:37 +0000 (22 12:53 -0700)
committerDevang Patel <dpatel@gcc.gnu.org>
Tue, 22 Apr 2003 19:53:37 +0000 (22 12:53 -0700)
tree1f535ef24ed4c1235f09eae48f23fe17a4226185
parentf945b4e0f5e0b90aa39b74c1bc4f9f5f2f8170ae
Remove conflict indicator.

From-SVN: r65953
gcc/ChangeLog