Failed merge on repository
Cacti / monitor
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)
Merged repository
Cacti / core (v1.2.x)
Received repository notification
Cacti / flowview