Forgot to mention this is the sugar module, update-1 branch. On Dec 12, 2007 10:31 AM, Marco Pesenti Gritti <mpgritti at gmail.com> wrote: > Hello, > > ml.po and pa.po contained conflicts in git. I removed the conflicts > manually since I need to do a release. > > Marco >