How do I correct this subversion conflict, tree problem?

Question

I have some subversion source I have been working on.

When I try to checkin I get the following error.

matth@blaze:~/dev/myproj$ svn commit svn: Commit failed (details follow): svn: Aborting commit: '/home/matth/dev/myproj/client' remains in conflict

In actual fact, client is missing. That's ok, I don't need it under linux. Suprised it's saying there is a conflict with it though.

Tried doing an update but it shows nothing. How do I remove the conflict and update client to check it out?