admin/rest has been moved to nucleus, so you shouldn't have anything there.
I expect that:
rm -rf appserver/admin/rest
will fix the problem.
On 8/25/2011 4:35 PM, Bill Shannon wrote:
> 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.