svn update po/xxx conflict

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


Wolfgang

Reply via email to