svn - remain in conflict

A folder was marked as in conflict ... don't know why!
I had to go to dos prompt and finally found that

> svn info

told me about a conflict properties file ... so I deleted this!
Then I could commit again ;-)