Re: svn update po/xxx conflict

Wolfgang Engelmann wrote:
> what is recommended to do if during a svn update of LyX a
> conflict in »po/xxx.po« is detected?


Just delete the affected files (including the .rej etc. files) and update 
again.

Jürgen

Reply via email to