thewitness/bin/sh: warning: setlocale: LC_ALL: cannot change locale (C.UTF-8) /bin/sh: warning: setlocale: LC_ALL: cannot change locale (C.UTF-8) warning: Cannot merge binary files: locales/LC_MESSAGES/fr-FR.mo (HEAD vs. develop) Auto-merging locales/po/fr-FR.po CONFLICT (content): Merge conflict in locales/po/fr-FR.po Auto-merging locales/po/cacti.pot CONFLICT (content): Merge conflict in locales/po/cacti.pot Auto-merging locales/LC_MESSAGES/fr-FR.mo CONFLICT (content): Merge conflict in locales/LC_MESSAGES/fr-FR.mo Automatic merge failed; fix conflicts and then commit the result. (1)3 years ago