* config/rs6000/rs6000.c: Remove conflict markers.
authorRichard Henderson <rth@redhat.com>
Tue, 3 May 2005 19:03:06 +0000 (12:03 -0700)
committerRichard Henderson <rth@gcc.gnu.org>
Tue, 3 May 2005 19:03:06 +0000 (12:03 -0700)
commita5c4dfe2b36331abaff449f5ab3e3298a0346b5f
tree4711911e7c7264b51f83dfe4c2fb2198245bb698
parentf384d65856a244b10696cc7b422a60156717cc9a
* config/rs6000/rs6000.c: Remove conflict markers.

From-SVN: r99174
gcc/ChangeLog
gcc/config/rs6000/rs6000.c