Look for <<<<<<< HEAD in the jacked up file by opening it in Notepad++. Clean up each messed up spot manually. Rinse and repeat.
No comments:
Post a Comment