Hi,
During my last update I received a warning that a certain file in the theme folder (.zip package) was conflicted. Exact error message: The following files are conflicted: [path-to-file].
I was unable to resolve this. Even if I browse the repository from SVN, nothing strikes me as wrong that could cause this conflict. I even ended up downloading a copy of the the theme package from the repository, but to no avail.
Whenever I want to commit to the repository I get the error message that "One or more files are conflicted. Please use TortoiseSVN to resolve these conflicts."
Can anyone help me out?
(removing the file also didn't work)