05-13-2013, 04:40 AM
It probably conflicted, because I committed another few changes in that same file in the meantime. Alright, I'll commit it it, with attribution
To fix your sources, delete the file altogether and then do a svn update, it will restore the file.
To fix your sources, delete the file altogether and then do a svn update, it will restore the file.