[nvda-translations] conflict with italian nvda.po

  • From: Simone Dal Maso <simone.dalmaso@xxxxxxxx>
  • To: nvda-translations@xxxxxxxxxxxxx
  • Date: Mon, 10 Sep 2012 17:59:28 +0200

Hello,
today when I wrote svn update, svn tell me that there is a conflict in nvda.po.
I don't know the cause.
What is the best thing to do now?
I have several files now...
nvda.po, nvda.po.mine, nvda.po.r4956, nvda.po.r4991.
what do you suggest to me?
thank you.

Other related posts:

  • » [nvda-translations] conflict with italian nvda.po - Simone Dal Maso