[Qgis-community-team] git pull conflicts on the server

[Otto Dassau]

Hi Richard,

i18n/nl/LC_MESSAGES/user_manual/preamble/foreword.po gives a conflict, if I
make a git pull on qgis.org. Did you create the last changes via pootle? Or
was it just a checkout, update with linguist and commit and push back again.

thanks
Otto