This is not a conflict and to get rid of the change you can commit the change without issues.
As Erwin mentioned, you can commit it, if the error is not blocking you.
Also, you can install and configure Tortoise SVN properly, which allows you to revert all the changes from your project if you really want to get rid of local changes.
Or, just delete the local copy and download again.
You can always install Tortoise SVN(1.7 I think) to revert the local project copy to get rid of this.