I updated our logo in the theme customizer and now when I try merging the changes from the desktop modeler I get this error? Does anyone know how I can resolve this?
asked
Julie Collier
1 answers
1
Yes, install Tortoise SVN (version 1.7) and resolve the conflicts manually by right clicking the files and selecting the right option.