you can uncheck the box that says 'try to patch these files'
let the upgrade complete and then go and check the two problem files by hand.
with the database use phpmyadmin and try and apply the patch line by line.
your error looks like that part of the sql patch has already been done
|