From: Bill Shannon <bill.shannon_at_oracle.com>
Date: Thu, 25 Aug 2011 14:35:46 -0700

How do I resolve this svn conflict?

A + C appserver/admin/rest
> local edit, incoming delete upon update
  M + appserver/admin/rest/rest-client


As far as I know, I didn't change anything, this conflict just
appeared when I updated.