Auto-merging locales/po/cacti.pot
CONFLICT (content): Merge conflict in locales/po/cacti.pot
Automatic merge failed; fix conflicts and then commit the result.
(1)
Auto-merging locales/po/cacti.pot
CONFLICT (content): Merge conflict in locales/po/cacti.pot
Automatic merge failed; fix conflicts and then commit the result.
(1)
Auto-merging locales/po/cacti.pot
CONFLICT (content): Merge conflict in locales/po/cacti.pot
Automatic merge failed; fix conflicts and then commit the result.
(1)
Auto-merging locales/po/cacti.pot
CONFLICT (content): Merge conflict in locales/po/cacti.pot
Automatic merge failed; fix conflicts and then commit the result.
(1)
None
admin