NoneFirst, rewinding head to replay your work on top of it... Applying: Correct header shebang .git/rebase-apply/patch:4106: trailing whitespace. With that said, there are several changes that you MUST perform to MySQL/MariaDB .git/rebase-apply/patch:4160: trailing whitespace. do .git/rebase-apply/patch:4269: trailing whitespace. ### Check out the Cacti Group's Official YouTube channel .git/rebase-apply/patch:4425: trailing whitespace. If a vulnerability is reproducible with evidence, please .git/rebase-apply/patch:4426: trailing whitespace. contact us on [email protected]. We would appreciate warning: squelched 2355 whitespace errors warning: 2360 lines add whitespace errors. Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. warning: Cannot merge binary files: locales/LC_MESSAGES/zh-TW.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/zh-CN.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/vi-VN.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/tr-TR.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/sv-SE.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/ru-RU.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/pt-PT.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/pt-BR.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/pl-PL.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/nl-NL.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/ko-KR.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/ja-JP.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/it-IT.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/hi-IN.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/he-IL.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/fr-FR.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/es-ES.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/el-GR.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/de-DE.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/bg-BG.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/ar-SA.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: install/templates/Windows_Device.xml.gz (HEAD vs. Correct header shebang) warning: Cannot merge binary files: install/templates/NetSNMP_Device.xml.gz (HEAD vs. Correct header shebang) warning: Cannot merge binary files: install/templates/Local_Linux_Machine.xml.gz (HEAD vs. Correct header shebang) warning: Cannot merge binary files: install/templates/Generic_SNMP_Device.xml.gz (HEAD vs. Correct header shebang) warning: Cannot merge binary files: install/templates/Cisco_Router.xml.gz (HEAD vs. Correct header shebang) warning: Cannot merge binary files: install/templates/Cacti_Stats.xml.gz (HEAD vs. Correct header shebang) warning: Cannot merge binary files: images/cacti_logo_new.gif (HEAD vs. Correct header shebang) warning: Cannot merge binary files: images/cacti_logo.gif (HEAD vs. Correct header shebang) CONFLICT (add/add): Merge conflict in vdef.php Auto-merging vdef.php CONFLICT (add/add): Merge conflict in utilities.php Auto-merging utilities.php CONFLICT (add/add): Merge conflict in user_group_admin.php Auto-merging user_group_admin.php CONFLICT (add/add): Merge conflict in user_domains.php Auto-merging user_domains.php CONFLICT (add/add): Merge conflict in user_admin.php Auto-merging user_admin.php CONFLICT (add/add): Merge conflict in tree.php Auto-merging tree.php CONFLICT (add/add): Merge conflict in tests/tools/check_install_code.php Auto-merging tests/tools/check_install_code.php CONFLICT (add/add): Merge conflict in tests/tools/check_cli_version.sh Auto-merging tests/tools/check_cli_version.sh CONFLICT (add/add): Merge conflict in tests/tools/check_all_pages.sh Auto-merging tests/tools/check_all_pages.sh CONFLICT (add/add): Merge conflict in tests/tools/cacti.conf Auto-merging tests/tools/cacti.conf CONFLICT (add/add): Merge conflict in templates_import.php Auto-merging templates_import.php CONFLICT (add/add): Merge conflict in templates_export.php Auto-merging templates_export.php CONFLICT (add/add): Merge conflict in support.php Auto-merging support.php CONFLICT (add/add): Merge conflict in spikekill.php Auto-merging spikekill.php CONFLICT (add/add): Merge conflict in snmpagent_persist.php Auto-merging snmpagent_persist.php CONFLICT (add/add): Merge conflict in snmpagent_mibcachechild.php Auto-merging snmpagent_mibcachechild.php CONFLICT (add/add): Merge conflict in snmpagent_mibcache.php Auto-merging snmpagent_mibcache.php CONFLICT (add/add): Merge conflict in sites.php Auto-merging sites.php CONFLICT (add/add): Merge conflict in settings.php Auto-merging settings.php CONFLICT (add/add): Merge conflict in service/index.php Auto-merging service/index.php CONFLICT (add/add): Merge conflict in service/README.md Auto-merging service/README.md CONFLICT (add/add): Merge conflict in scripts/weatherbug.pl Auto-merging scripts/weatherbug.pl CONFLICT (add/add): Merge conflict in scripts/ss_webseer.php Auto-merging scripts/ss_webseer.php CONFLICT (add/add): Merge conflict in scripts/ss_sql.php Auto-merging scripts/ss_sql.php CONFLICT (add/add): Merge conflict in scripts/ss_poller.php Auto-merging scripts/ss_poller.php CONFLICT (add/add): Merge conflict in scripts/ss_net_snmp_disk_io.php Auto-merging scripts/ss_net_snmp_disk_io.php CONFLICT (add/add): Merge conflict in scripts/ss_net_snmp_disk_bytes.php Auto-merging scripts/ss_net_snmp_disk_bytes.php CONFLICT (add/add): Merge conflict in scripts/ss_hstats.php Auto-merging scripts/ss_hstats.php CONFLICT (add/add): Merge conflict in scripts/ss_host_disk.php Auto-merging scripts/ss_host_disk.php CONFLICT (add/add): Merge conflict in scripts/ss_host_cpu.php Auto-merging scripts/ss_host_cpu.php CONFLICT (add/add): Merge conflict in scripts/ss_gexport.php Auto-merging scripts/ss_gexport.php CONFLICT (add/add): Merge conflict in scripts/ss_fping.php Auto-merging scripts/ss_fping.php CONFLICT (add/add): Merge conflict in scripts/ss_cpoller.php Auto-merging scripts/ss_cpoller.php CONFLICT (add/add): Merge conflict in scripts/ss_count_oids.php Auto-merging scripts/ss_count_oids.php CONFLICT (add/add): Merge conflict in scripts/query_host_partitions.php Auto-merging scripts/query_host_partitions.php CONFLICT (add/add): Merge conflict in scripts/query_host_cpu.php Auto-merging scripts/query_host_cpu.php CONFLICT (add/add): Merge conflict in scripts/index.php Auto-merging scripts/index.php CONFLICT (add/add): Merge conflict in scripts/diskfree.sh Auto-merging scripts/diskfree.sh CONFLICT (add/add): Merge conflict in scripts/cacti_user_stats.php Auto-merging scripts/cacti_user_stats.php CONFLICT (add/add): Merge conflict in script_server.php Auto-merging script_server.php CONFLICT (add/add): Merge conflict in rrdcleaner.php Auto-merging rrdcleaner.php CONFLICT (add/add): Merge conflict in resource/snmp_queries/interface.xml Auto-merging resource/snmp_queries/interface.xml CONFLICT (add/add): Merge conflict in resource/snmp_queries/index.php Auto-merging resource/snmp_queries/index.php CONFLICT (add/add): Merge conflict in resource/script_server/webseer.xml Auto-merging resource/script_server/webseer.xml CONFLICT (add/add): Merge conflict in resource/script_server/index.php Auto-merging resource/script_server/index.php CONFLICT (add/add): Merge conflict in resource/script_server/host_disk.xml Auto-merging resource/script_server/host_disk.xml CONFLICT (add/add): Merge conflict in resource/script_server/host_cpu.xml Auto-merging resource/script_server/host_cpu.xml CONFLICT (add/add): Merge conflict in resource/script_server/gexport.xml Auto-merging resource/script_server/gexport.xml CONFLICT (add/add): Merge conflict in resource/script_server/cpoller.xml Auto-merging resource/script_server/cpoller.xml CONFLICT (add/add): Merge conflict in resource/script_queries/unix_disk.xml Auto-merging resource/script_queries/unix_disk.xml CONFLICT (add/add): Merge conflict in resource/script_queries/index.php Auto-merging resource/script_queries/index.php CONFLICT (add/add): Merge conflict in resource/script_queries/host_disk.xml Auto-merging resource/script_queries/host_disk.xml CONFLICT (add/add): Merge conflict in resource/script_queries/host_cpu.xml Auto-merging resource/script_queries/host_cpu.xml CONFLICT (add/add): Merge conflict in resource/index.php Auto-merging resource/index.php CONFLICT (add/add): Merge conflict in reports_user.php Auto-merging reports_user.php CONFLICT (add/add): Merge conflict in reports_admin.php Auto-merging reports_admin.php CONFLICT (add/add): Merge conflict in remote_agent.php Auto-merging remote_agent.php CONFLICT (add/add): Merge conflict in pollers.php Auto-merging pollers.php CONFLICT (add/add): Merge conflict in poller_spikekill.php Auto-merging poller_spikekill.php CONFLICT (add/add): Merge conflict in poller_reports.php Auto-merging poller_reports.php CONFLICT (add/add): Merge conflict in poller_recovery.php Auto-merging poller_recovery.php CONFLICT (add/add): Merge conflict in poller_realtime.php Auto-merging poller_realtime.php CONFLICT (add/add): Merge conflict in poller_maintenance.php Auto-merging poller_maintenance.php CONFLICT (add/add): Merge conflict in poller_dsstats.php Auto-merging poller_dsstats.php CONFLICT (add/add): Merge conflict in poller_commands.php Auto-merging poller_commands.php CONFLICT (add/add): Merge conflict in poller_boost.php Auto-merging poller_boost.php CONFLICT (add/add): Merge conflict in poller_automation.php Auto-merging poller_automation.php CONFLICT (add/add): Merge conflict in poller.php Auto-merging poller.php CONFLICT (add/add): Merge conflict in plugins/index.php Auto-merging plugins/index.php CONFLICT (add/add): Merge conflict in plugins.php Auto-merging plugins.php CONFLICT (add/add): Merge conflict in permission_denied.php Auto-merging permission_denied.php CONFLICT (add/add): Merge conflict in mibs/index.php Auto-merging mibs/index.php CONFLICT (add/add): Merge conflict in mibs/CACTI-SNMPAGENT-MIB Auto-merging mibs/CACTI-SNMPAGENT-MIB CONFLICT (add/add): Merge conflict in mibs/CACTI-MIB Auto-merging mibs/CACTI-MIB CONFLICT (add/add): Merge conflict in mibs/CACTI-BOOST-MIB Auto-merging mibs/CACTI-BOOST-MIB CONFLICT (add/add): Merge conflict in managers.php Auto-merging managers.php CONFLICT (add/add): Merge conflict in logout.php Auto-merging logout.php CONFLICT (add/add): Merge conflict in log/index.php Auto-merging log/index.php CONFLICT (add/add): Merge conflict in locales/po/zh-TW.po Auto-merging locales/po/zh-TW.po CONFLICT (add/add): Merge conflict in locales/po/zh-CN.po Auto-merging locales/po/zh-CN.po CONFLICT (add/add): Merge conflict in locales/po/vi-VN.po Auto-merging locales/po/vi-VN.po CONFLICT (add/add): Merge conflict in locales/po/tr-TR.po Auto-merging locales/po/tr-TR.po CONFLICT (add/add): Merge conflict in locales/po/sv-SE.po Auto-merging locales/po/sv-SE.po CONFLICT (add/add): Merge conflict in locales/po/ru-RU.po Auto-merging locales/po/ru-RU.po CONFLICT (add/add): Merge conflict in locales/po/pt-PT.po Auto-merging locales/po/pt-PT.po CONFLICT (add/add): Merge conflict in locales/po/pt-BR.po Auto-merging locales/po/pt-BR.po CONFLICT (add/add): Merge conflict in locales/po/pl-PL.po Auto-merging locales/po/pl-PL.po CONFLICT (add/add): Merge conflict in locales/po/nl-NL.po Auto-merging locales/po/nl-NL.po CONFLICT (add/add): Merge conflict in locales/po/ko-KR.po Auto-merging locales/po/ko-KR.po CONFLICT (add/add): Merge conflict in locales/po/ja-JP.po Auto-merging locales/po/ja-JP.po CONFLICT (add/add): Merge conflict in locales/po/it-IT.po Auto-merging locales/po/it-IT.po CONFLICT (add/add): Merge conflict in locales/po/index.php Auto-merging locales/po/index.php CONFLICT (add/add): Merge conflict in locales/po/hi-IN.po Auto-merging locales/po/hi-IN.po CONFLICT (add/add): Merge conflict in locales/po/he-IL.po Auto-merging locales/po/he-IL.po CONFLICT (add/add): Merge conflict in locales/po/fr-FR.po Auto-merging locales/po/fr-FR.po CONFLICT (add/add): Merge conflict in locales/po/es-ES.po Auto-merging locales/po/es-ES.po CONFLICT (add/add): Merge conflict in locales/po/el-GR.po Auto-merging locales/po/el-GR.po CONFLICT (add/add): Merge conflict in locales/po/de-DE.po Auto-merging locales/po/de-DE.po CONFLICT (add/add): Merge conflict in locales/po/cacti.pot Auto-merging locales/po/cacti.pot CONFLICT (add/add): Merge conflict in locales/po/bg-BG.po Auto-merging locales/po/bg-BG.po CONFLICT (add/add): Merge conflict in locales/po/ar-SA.po Auto-merging locales/po/ar-SA.po CONFLICT (add/add): Merge conflict in locales/index.php Auto-merging locales/index.php CONFLICT (add/add): Merge conflict in locales/build_mo.sh Auto-merging locales/build_mo.sh CONFLICT (add/add): Merge conflict in locales/build_gettext.sh Auto-merging locales/build_gettext.sh CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/zh-TW.mo Auto-merging locales/LC_MESSAGES/zh-TW.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/zh-CN.mo Auto-merging locales/LC_MESSAGES/zh-CN.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/vi-VN.mo Auto-merging locales/LC_MESSAGES/vi-VN.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/tr-TR.mo Auto-merging locales/LC_MESSAGES/tr-TR.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/sv-SE.mo Auto-merging locales/LC_MESSAGES/sv-SE.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/ru-RU.mo Auto-merging locales/LC_MESSAGES/ru-RU.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/pt-PT.mo Auto-merging locales/LC_MESSAGES/pt-PT.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/pt-BR.mo Auto-merging locales/LC_MESSAGES/pt-BR.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/pl-PL.mo Auto-merging locales/LC_MESSAGES/pl-PL.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/nl-NL.mo Auto-merging locales/LC_MESSAGES/nl-NL.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/ko-KR.mo Auto-merging locales/LC_MESSAGES/ko-KR.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/ja-JP.mo Auto-merging locales/LC_MESSAGES/ja-JP.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/it-IT.mo Auto-merging locales/LC_MESSAGES/it-IT.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/index.php Auto-merging locales/LC_MESSAGES/index.php CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/hi-IN.mo Auto-merging locales/LC_MESSAGES/hi-IN.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/he-IL.mo Auto-merging locales/LC_MESSAGES/he-IL.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/fr-FR.mo Auto-merging locales/LC_MESSAGES/fr-FR.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/es-ES.mo Auto-merging locales/LC_MESSAGES/es-ES.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/el-GR.mo Auto-merging locales/LC_MESSAGES/el-GR.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/de-DE.mo Auto-merging locales/LC_MESSAGES/de-DE.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/bg-BG.mo Auto-merging locales/LC_MESSAGES/bg-BG.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/ar-SA.mo Auto-merging locales/LC_MESSAGES/ar-SA.mo CONFLICT (add/add): Merge conflict in links.php Auto-merging links.php CONFLICT (add/add): Merge conflict in link.php Auto-merging link.php CONFLICT (add/add): Merge conflict in lib/xml.php Auto-merging lib/xml.php CONFLICT (add/add): Merge conflict in lib/vdef.php Auto-merging lib/vdef.php CONFLICT (add/add): Merge conflict in lib/variables.php Auto-merging lib/variables.php CONFLICT (add/add): Merge conflict in lib/utility.php Auto-merging lib/utility.php CONFLICT (add/add): Merge conflict in lib/timespan_settings.php Auto-merging lib/timespan_settings.php CONFLICT (add/add): Merge conflict in lib/time.php Auto-merging lib/time.php CONFLICT (add/add): Merge conflict in lib/template.php Auto-merging lib/template.php CONFLICT (add/add): Merge conflict in lib/spikekill.php Auto-merging lib/spikekill.php CONFLICT (add/add): Merge conflict in lib/sort.php Auto-merging lib/sort.php CONFLICT (add/add): Merge conflict in lib/snmpagent.php Auto-merging lib/snmpagent.php CONFLICT (add/add): Merge conflict in lib/snmp.php Auto-merging lib/snmp.php CONFLICT (add/add): Merge conflict in lib/rrd.php Auto-merging lib/rrd.php CONFLICT (add/add): Merge conflict in lib/reports.php Auto-merging lib/reports.php CONFLICT (add/add): Merge conflict in lib/poller.php Auto-merging lib/poller.php CONFLICT (add/add): Merge conflict in lib/plugins.php Auto-merging lib/plugins.php CONFLICT (add/add): Merge conflict in lib/ping.php Auto-merging lib/ping.php CONFLICT (add/add): Merge conflict in lib/mib_cache.php Auto-merging lib/mib_cache.php CONFLICT (add/add): Merge conflict in lib/ldap.php Auto-merging lib/ldap.php CONFLICT (add/add): Merge conflict in lib/installer.php Auto-merging lib/installer.php CONFLICT (add/add): Merge conflict in lib/index.php Auto-merging lib/index.php CONFLICT (add/add): Merge conflict in lib/import.php Auto-merging lib/import.php CONFLICT (add/add): Merge conflict in lib/html_validate.php Auto-merging lib/html_validate.php CONFLICT (add/add): Merge conflict in lib/html_utility.php Auto-merging lib/html_utility.php CONFLICT (add/add): Merge conflict in lib/html_tree.php Auto-merging lib/html_tree.php CONFLICT (add/add): Merge conflict in lib/html_reports.php Auto-merging lib/html_reports.php CONFLICT (add/add): Merge conflict in lib/html_graph.php Auto-merging lib/html_graph.php CONFLICT (add/add): Merge conflict in lib/html_form_template.php Auto-merging lib/html_form_template.php CONFLICT (add/add): Merge conflict in lib/html_form.php Auto-merging lib/html_form.php CONFLICT (add/add): Merge conflict in lib/html_filter.php Auto-merging lib/html_filter.php CONFLICT (add/add): Merge conflict in lib/html.php Auto-merging lib/html.php CONFLICT (add/add): Merge conflict in lib/graphs.php Auto-merging lib/graphs.php CONFLICT (add/add): Merge conflict in lib/graph_variables.php Auto-merging lib/graph_variables.php CONFLICT (add/add): Merge conflict in lib/functions.php Auto-merging lib/functions.php CONFLICT (add/add): Merge conflict in lib/export.php Auto-merging lib/export.php CONFLICT (add/add): Merge conflict in lib/dsstats.php Auto-merging lib/dsstats.php CONFLICT (add/add): Merge conflict in lib/dsdebug.php Auto-merging lib/dsdebug.php CONFLICT (add/add): Merge conflict in lib/database.php Auto-merging lib/database.php CONFLICT (add/add): Merge conflict in lib/data_query.php Auto-merging lib/data_query.php CONFLICT (add/add): Merge conflict in lib/clog_webapi.php Auto-merging lib/clog_webapi.php CONFLICT (add/add): Merge conflict in lib/cdef.php Auto-merging lib/cdef.php CONFLICT (add/add): Merge conflict in lib/boost.php Auto-merging lib/boost.php CONFLICT (add/add): Merge conflict in lib/auth.php Auto-merging lib/auth.php CONFLICT (add/add): Merge conflict in lib/api_tree.php Auto-merging lib/api_tree.php CONFLICT (add/add): Merge conflict in lib/api_poller.php Auto-merging lib/api_poller.php CONFLICT (add/add): Merge conflict in lib/api_graph.php Auto-merging lib/api_graph.php CONFLICT (add/add): Merge conflict in lib/api_device.php Auto-merging lib/api_device.php CONFLICT (add/add): Merge conflict in lib/api_data_source.php Auto-merging lib/api_data_source.php CONFLICT (add/add): Merge conflict in lib/api_automation_tools.php Auto-merging lib/api_automation_tools.php CONFLICT (add/add): Merge conflict in lib/api_automation.php Auto-merging lib/api_automation.php CONFLICT (add/add): Merge conflict in lib/api_aggregate.php Auto-merging lib/api_aggregate.php CONFLICT (add/add): Merge conflict in lib/aggregate.php Auto-merging lib/aggregate.php CONFLICT (add/add): Merge conflict in install/upgrades/index.php Auto-merging install/upgrades/index.php CONFLICT (add/add): Merge conflict in install/upgrades/1_3_0.php Auto-merging install/upgrades/1_3_0.php CONFLICT (add/add): Merge conflict in install/upgrades/1_2_8.php Auto-merging install/upgrades/1_2_8.php CONFLICT (add/add): Merge conflict in install/upgrades/1_2_7.php Auto-merging install/upgrades/1_2_7.php CONFLICT (add/add): Merge conflict in install/upgrades/1_2_5.php Auto-merging install/upgrades/1_2_5.php CONFLICT (add/add): Merge conflict in install/upgrades/1_2_3.php Auto-merging install/upgrades/1_2_3.php CONFLICT (add/add): Merge conflict in install/upgrades/1_2_2.php Auto-merging install/upgrades/1_2_2.php CONFLICT (add/add): Merge conflict in install/upgrades/1_2_17.php Auto-merging install/upgrades/1_2_17.php CONFLICT (add/add): Merge conflict in install/upgrades/1_2_15.php Auto-merging install/upgrades/1_2_15.php CONFLICT (add/add): Merge conflict in install/upgrades/1_2_14.php Auto-merging install/upgrades/1_2_14.php CONFLICT (add/add): Merge conflict in install/upgrades/1_2_11.php Auto-merging install/upgrades/1_2_11.php CONFLICT (add/add): Merge conflict in install/upgrades/1_2_1.php Auto-merging install/upgrades/1_2_1.php CONFLICT (add/add): Merge conflict in install/upgrades/1_2_0.php Auto-merging install/upgrades/1_2_0.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_8.php Auto-merging install/upgrades/1_1_8.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_7.php Auto-merging install/upgrades/1_1_7.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_6.php Auto-merging install/upgrades/1_1_6.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_4.php Auto-merging install/upgrades/1_1_4.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_37.php Auto-merging install/upgrades/1_1_37.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_36.php Auto-merging install/upgrades/1_1_36.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_35.php Auto-merging install/upgrades/1_1_35.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_34.php Auto-merging install/upgrades/1_1_34.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_31.php Auto-merging install/upgrades/1_1_31.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_28.php Auto-merging install/upgrades/1_1_28.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_26.php Auto-merging install/upgrades/1_1_26.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_20.php Auto-merging install/upgrades/1_1_20.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_2.php Auto-merging install/upgrades/1_1_2.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_17.php Auto-merging install/upgrades/1_1_17.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_14.php Auto-merging install/upgrades/1_1_14.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_11.php Auto-merging install/upgrades/1_1_11.php CONFLICT (add/add): Merge conflict in install/upgrades/1_0_5.php Auto-merging install/upgrades/1_0_5.php CONFLICT (add/add): Merge conflict in install/upgrades/1_0_4.php Auto-merging install/upgrades/1_0_4.php CONFLICT (add/add): Merge conflict in install/upgrades/1_0_0.php Auto-merging install/upgrades/1_0_0.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_8.php Auto-merging install/upgrades/0_8_8.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_7h.php Auto-merging install/upgrades/0_8_7h.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_7c.php Auto-merging install/upgrades/0_8_7c.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_7b.php Auto-merging install/upgrades/0_8_7b.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_7a.php Auto-merging install/upgrades/0_8_7a.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_7.php Auto-merging install/upgrades/0_8_7.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_6i.php Auto-merging install/upgrades/0_8_6i.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_6h.php Auto-merging install/upgrades/0_8_6h.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_6g.php Auto-merging install/upgrades/0_8_6g.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_6e.php Auto-merging install/upgrades/0_8_6e.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_6d.php Auto-merging install/upgrades/0_8_6d.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_6a.php Auto-merging install/upgrades/0_8_6a.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_6.php Auto-merging install/upgrades/0_8_6.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_5.php Auto-merging install/upgrades/0_8_5.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_4.php Auto-merging install/upgrades/0_8_4.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_3.php Auto-merging install/upgrades/0_8_3.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_2a.php Auto-merging install/upgrades/0_8_2a.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_2.php Auto-merging install/upgrades/0_8_2.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_1.php Auto-merging install/upgrades/0_8_1.php CONFLICT (add/add): Merge conflict in install/templates/Windows_Device.xml.gz Auto-merging install/templates/Windows_Device.xml.gz CONFLICT (add/add): Merge conflict in install/templates/NetSNMP_Device.xml.gz Auto-merging install/templates/NetSNMP_Device.xml.gz CONFLICT (add/add): Merge conflict in install/templates/Local_Linux_Machine.xml.gz Auto-merging install/templates/Local_Linux_Machine.xml.gz CONFLICT (add/add): Merge conflict in install/templates/Generic_SNMP_Device.xml.gz Auto-merging install/templates/Generic_SNMP_Device.xml.gz CONFLICT (add/add): Merge conflict in install/templates/Cisco_Router.xml.gz Auto-merging install/templates/Cisco_Router.xml.gz CONFLICT (add/add): Merge conflict in install/templates/Cacti_Stats.xml.gz Auto-merging install/templates/Cacti_Stats.xml.gz CONFLICT (add/add): Merge conflict in install/step_json.php Auto-merging install/step_json.php CONFLICT (add/add): Merge conflict in install/install.php Auto-merging install/install.php CONFLICT (add/add): Merge conflict in install/install.js Auto-merging install/install.js CONFLICT (add/add): Merge conflict in install/install.css Auto-merging install/install.css CONFLICT (add/add): Merge conflict in install/index.php Auto-merging install/index.php CONFLICT (add/add): Merge conflict in install/functions.php Auto-merging install/functions.php CONFLICT (add/add): Merge conflict in install/cli_test.php Auto-merging install/cli_test.php CONFLICT (add/add): Merge conflict in install/cli_check.php Auto-merging install/cli_check.php CONFLICT (add/add): Merge conflict in install/background.php Auto-merging install/background.php CONFLICT (add/add): Merge conflict in index.php Auto-merging index.php CONFLICT (add/add): Merge conflict in include/vendor/phpsnmp/mib_parser.php Auto-merging include/vendor/phpsnmp/mib_parser.php CONFLICT (add/add): Merge conflict in include/vendor/phpsnmp/extension.php Auto-merging include/vendor/phpsnmp/extension.php CONFLICT (add/add): Merge conflict in include/vendor/phpsnmp/classSNMP.php Auto-merging include/vendor/phpsnmp/classSNMP.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/bootstrap.php Auto-merging include/vendor/phpseclib/bootstrap.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/System/SSH/Agent.php Auto-merging include/vendor/phpseclib/System/SSH/Agent.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/Net/SSH2.php Auto-merging include/vendor/phpseclib/Net/SSH2.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/Net/SFTP.php Auto-merging include/vendor/phpseclib/Net/SFTP.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/Math/BigInteger.php Auto-merging include/vendor/phpseclib/Math/BigInteger.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/File/X509.php Auto-merging include/vendor/phpseclib/File/X509.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/File/ASN1.php Auto-merging include/vendor/phpseclib/File/ASN1.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/Crypt/Twofish.php Auto-merging include/vendor/phpseclib/Crypt/Twofish.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/Crypt/Rijndael.php Auto-merging include/vendor/phpseclib/Crypt/Rijndael.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/Crypt/RSA.php Auto-merging include/vendor/phpseclib/Crypt/RSA.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/Crypt/RC2.php Auto-merging include/vendor/phpseclib/Crypt/RC2.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/Crypt/DES.php Auto-merging include/vendor/phpseclib/Crypt/DES.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/Crypt/Blowfish.php Auto-merging include/vendor/phpseclib/Crypt/Blowfish.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/Crypt/Base.php Auto-merging include/vendor/phpseclib/Crypt/Base.php CONFLICT (add/add): Merge conflict in include/vendor/gettext/tests/TranslatorTest.php Auto-merging include/vendor/gettext/tests/TranslatorTest.php CONFLICT (add/add): Merge conflict in include/vendor/gettext/src/translator_functions.php Auto-merging include/vendor/gettext/src/translator_functions.php CONFLICT (add/add): Merge conflict in include/vendor/gettext/CONTRIBUTING.md Auto-merging include/vendor/gettext/CONTRIBUTING.md CONFLICT (add/add): Merge conflict in include/vendor/csrf/csrf-conf.php Auto-merging include/vendor/csrf/csrf-conf.php CONFLICT (add/add): Merge conflict in include/vendor/cldr-to-gettext-plural-rules/bin/export-plural-rules Auto-merging include/vendor/cldr-to-gettext-plural-rules/bin/export-plural-rules CONFLICT (add/add): Merge conflict in include/vendor/GoogleAuthenticator/RuntimeException.php Auto-merging include/vendor/GoogleAuthenticator/RuntimeException.php CONFLICT (add/add): Merge conflict in include/vendor/GoogleAuthenticator/GoogleQrUrl.php Auto-merging include/vendor/GoogleAuthenticator/GoogleQrUrl.php CONFLICT (add/add): Merge conflict in include/vendor/GoogleAuthenticator/GoogleAuthenticatorInterface.php Auto-merging include/vendor/GoogleAuthenticator/GoogleAuthenticatorInterface.php CONFLICT (add/add): Merge conflict in include/vendor/GoogleAuthenticator/GoogleAuthenticator.php Auto-merging include/vendor/GoogleAuthenticator/GoogleAuthenticator.php CONFLICT (add/add): Merge conflict in include/vendor/GoogleAuthenticator/FixedBitNotation.php Auto-merging include/vendor/GoogleAuthenticator/FixedBitNotation.php CONFLICT (add/add): Merge conflict in include/top_header.php Auto-merging include/top_header.php CONFLICT (add/add): Merge conflict in include/top_graph_header.php Auto-merging include/top_graph_header.php CONFLICT (add/add): Merge conflict in include/top_general_header.php Auto-merging include/top_general_header.php CONFLICT (add/add): Merge conflict in include/themes/sunrise/rrdtheme.php Auto-merging include/themes/sunrise/rrdtheme.php CONFLICT (add/add): Merge conflict in include/themes/sunrise/main.js Auto-merging include/themes/sunrise/main.js CONFLICT (add/add): Merge conflict in include/themes/sunrise/main.css Auto-merging include/themes/sunrise/main.css CONFLICT (add/add): Merge conflict in include/themes/sunrise/index.php Auto-merging include/themes/sunrise/index.php CONFLICT (add/add): Merge conflict in include/themes/sunrise/images/index.php Auto-merging include/themes/sunrise/images/index.php CONFLICT (add/add): Merge conflict in include/themes/sunrise/default/index.php Auto-merging include/themes/sunrise/default/index.php CONFLICT (add/add): Merge conflict in include/themes/raspberry/rrdtheme.php Auto-merging include/themes/raspberry/rrdtheme.php CONFLICT (add/add): Merge conflict in include/themes/raspberry/main.js Auto-merging include/themes/raspberry/main.js CONFLICT (add/add): Merge conflict in include/themes/raspberry/index.php Auto-merging include/themes/raspberry/index.php CONFLICT (add/add): Merge conflict in include/themes/raspberry/images/index.php Auto-merging include/themes/raspberry/images/index.php CONFLICT (add/add): Merge conflict in include/themes/raspberry/default/index.php Auto-merging include/themes/raspberry/default/index.php CONFLICT (add/add): Merge conflict in include/themes/paw/rrdtheme.php Auto-merging include/themes/paw/rrdtheme.php CONFLICT (add/add): Merge conflict in include/themes/paw/main.js Auto-merging include/themes/paw/main.js CONFLICT (add/add): Merge conflict in include/themes/paw/main.css Auto-merging include/themes/paw/main.css CONFLICT (add/add): Merge conflict in include/themes/paw/jquery.timepicker.css Auto-merging include/themes/paw/jquery.timepicker.css CONFLICT (add/add): Merge conflict in include/themes/paw/index.php Auto-merging include/themes/paw/index.php CONFLICT (add/add): Merge conflict in include/themes/paw/images/index.php Auto-merging include/themes/paw/images/index.php CONFLICT (add/add): Merge conflict in include/themes/paw/default/index.php Auto-merging include/themes/paw/default/index.php CONFLICT (add/add): Merge conflict in include/themes/paper-plane/rrdtheme.php Auto-merging include/themes/paper-plane/rrdtheme.php CONFLICT (add/add): Merge conflict in include/themes/paper-plane/main.js Auto-merging include/themes/paper-plane/main.js CONFLICT (add/add): Merge conflict in include/themes/paper-plane/main.css Auto-merging include/themes/paper-plane/main.css CONFLICT (add/add): Merge conflict in include/themes/paper-plane/index.php Auto-merging include/themes/paper-plane/index.php CONFLICT (add/add): Merge conflict in include/themes/paper-plane/images/index.php Auto-merging include/themes/paper-plane/images/index.php CONFLICT (add/add): Merge conflict in include/themes/paper-plane/default/index.php Auto-merging include/themes/paper-plane/default/index.php CONFLICT (add/add): Merge conflict in include/themes/paper-plane/billboard.css Auto-merging include/themes/paper-plane/billboard.css CONFLICT (add/add): Merge conflict in include/themes/modern/rrdtheme.php Auto-merging include/themes/modern/rrdtheme.php CONFLICT (add/add): Merge conflict in include/themes/modern/main.js Auto-merging include/themes/modern/main.js CONFLICT (add/add): Merge conflict in include/themes/modern/main.css Auto-merging include/themes/modern/main.css CONFLICT (add/add): Merge conflict in include/themes/modern/index.php Auto-merging include/themes/modern/index.php CONFLICT (add/add): Merge conflict in include/themes/modern/images/index.php Auto-merging include/themes/modern/images/index.php CONFLICT (add/add): Merge conflict in include/themes/modern/default/index.php Auto-merging include/themes/modern/default/index.php CONFLICT (add/add): Merge conflict in include/themes/midwinter/rrdtheme.php Auto-merging include/themes/midwinter/rrdtheme.php CONFLICT (add/add): Merge conflict in include/themes/midwinter/pace.css Auto-merging include/themes/midwinter/pace.css CONFLICT (add/add): Merge conflict in include/themes/midwinter/main.js Auto-merging include/themes/midwinter/main.js CONFLICT (add/add): Merge conflict in include/themes/midwinter/main.css Auto-merging include/themes/midwinter/main.css CONFLICT (add/add): Merge conflict in include/themes/midwinter/jquery.zoom.css Auto-merging include/themes/midwinter/jquery.zoom.css CONFLICT (add/add): Merge conflict in include/themes/midwinter/index.php Auto-merging include/themes/midwinter/index.php CONFLICT (add/add): Merge conflict in include/themes/midwinter/images/index.php Auto-merging include/themes/midwinter/images/index.php CONFLICT (add/add): Merge conflict in include/themes/midwinter/default/index.php Auto-merging include/themes/midwinter/default/index.php CONFLICT (add/add): Merge conflict in include/themes/index.php Auto-merging include/themes/index.php CONFLICT (add/add): Merge conflict in include/themes/hollyberry/rrdtheme.php Auto-merging include/themes/hollyberry/rrdtheme.php CONFLICT (add/add): Merge conflict in include/themes/hollyberry/main.js Auto-merging include/themes/hollyberry/main.js CONFLICT (add/add): Merge conflict in include/themes/hollyberry/index.php Auto-merging include/themes/hollyberry/index.php CONFLICT (add/add): Merge conflict in include/themes/hollyberry/images/index.php Auto-merging include/themes/hollyberry/images/index.php CONFLICT (add/add): Merge conflict in include/themes/hollyberry/default/index.php Auto-merging include/themes/hollyberry/default/index.php CONFLICT (add/add): Merge conflict in include/themes/dark/rrdtheme.php Auto-merging include/themes/dark/rrdtheme.php CONFLICT (add/add): Merge conflict in include/themes/dark/main.js Auto-merging include/themes/dark/main.js CONFLICT (add/add): Merge conflict in include/themes/dark/main.css Auto-merging include/themes/dark/main.css CONFLICT (add/add): Merge conflict in include/themes/dark/index.php Auto-merging include/themes/dark/index.php CONFLICT (add/add): Merge conflict in include/themes/dark/images/index.php Auto-merging include/themes/dark/images/index.php CONFLICT (add/add): Merge conflict in include/themes/dark/default/index.php Auto-merging include/themes/dark/default/index.php CONFLICT (add/add): Merge conflict in include/themes/classic/rrdtheme.php Auto-merging include/themes/classic/rrdtheme.php CONFLICT (add/add): Merge conflict in include/themes/classic/main.js Auto-merging include/themes/classic/main.js CONFLICT (add/add): Merge conflict in include/themes/classic/main.css Auto-merging include/themes/classic/main.css CONFLICT (add/add): Merge conflict in include/themes/classic/index.php Auto-merging include/themes/classic/index.php CONFLICT (add/add): Merge conflict in include/themes/classic/images/index.php Auto-merging include/themes/classic/images/index.php CONFLICT (add/add): Merge conflict in include/themes/classic/default/index.php Auto-merging include/themes/classic/default/index.php CONFLICT (add/add): Merge conflict in include/themes/carrot/rrdtheme.php Auto-merging include/themes/carrot/rrdtheme.php CONFLICT (add/add): Merge conflict in include/themes/carrot/main.js Auto-merging include/themes/carrot/main.js CONFLICT (add/add): Merge conflict in include/themes/carrot/index.php Auto-merging include/themes/carrot/index.php CONFLICT (add/add): Merge conflict in include/themes/carrot/images/index.php Auto-merging include/themes/carrot/images/index.php CONFLICT (add/add): Merge conflict in include/themes/carrot/default/index.php Auto-merging include/themes/carrot/default/index.php CONFLICT (add/add): Merge conflict in include/themes/cacti/rrdtheme.php Auto-merging include/themes/cacti/rrdtheme.php CONFLICT (add/add): Merge conflict in include/themes/cacti/main.js Auto-merging include/themes/cacti/main.js CONFLICT (add/add): Merge conflict in include/themes/cacti/index.php Auto-merging include/themes/cacti/index.php CONFLICT (add/add): Merge conflict in include/themes/cacti/images/index.php Auto-merging include/themes/cacti/images/index.php CONFLICT (add/add): Merge conflict in include/themes/cacti/default/index.php Auto-merging include/themes/cacti/default/index.php CONFLICT (add/add): Merge conflict in include/session.php Auto-merging include/session.php CONFLICT (add/add): Merge conflict in include/realtime.js Auto-merging include/realtime.js CONFLICT (add/add): Merge conflict in include/plugins.php Auto-merging include/plugins.php CONFLICT (add/add): Merge conflict in include/layout.js Auto-merging include/layout.js CONFLICT (add/add): Merge conflict in include/js/pace.js Auto-merging include/js/pace.js CONFLICT (add/add): Merge conflict in include/js/jstree.js Auto-merging include/js/jstree.js CONFLICT (add/add): Merge conflict in include/js/jquery.zoom.js Auto-merging include/js/jquery.zoom.js CONFLICT (add/add): Merge conflict in include/js/jquery.multiselect.js Auto-merging include/js/jquery.multiselect.js CONFLICT (add/add): Merge conflict in include/js/jquery.js Auto-merging include/js/jquery.js CONFLICT (add/add): Merge conflict in include/js/jquery.dropdown.js Auto-merging include/js/jquery.dropdown.js CONFLICT (add/add): Merge conflict in include/js/jquery-ui.js Auto-merging include/js/jquery-ui.js CONFLICT (add/add): Merge conflict in include/js/billboard.js Auto-merging include/js/billboard.js CONFLICT (add/add): Merge conflict in include/index.php Auto-merging include/index.php CONFLICT (add/add): Merge conflict in include/global_settings.php Auto-merging include/global_settings.php CONFLICT (add/add): Merge conflict in include/global_session.php Auto-merging include/global_session.php CONFLICT (add/add): Merge conflict in include/global_languages.php Auto-merging include/global_languages.php CONFLICT (add/add): Merge conflict in include/global_form.php Auto-merging include/global_form.php CONFLICT (add/add): Merge conflict in include/global_constants.php Auto-merging include/global_constants.php CONFLICT (add/add): Merge conflict in include/global_arrays.php Auto-merging include/global_arrays.php CONFLICT (add/add): Merge conflict in include/global.php Auto-merging include/global.php CONFLICT (add/add): Merge conflict in include/fa/css/all.css Auto-merging include/fa/css/all.css CONFLICT (add/add): Merge conflict in include/csrf.php Auto-merging include/csrf.php CONFLICT (add/add): Merge conflict in include/content/index.php Auto-merging include/content/index.php CONFLICT (add/add): Merge conflict in include/config.php.dist Auto-merging include/config.php.dist CONFLICT (add/add): Merge conflict in include/cli_check.php Auto-merging include/cli_check.php CONFLICT (add/add): Merge conflict in include/bottom_footer.php Auto-merging include/bottom_footer.php CONFLICT (add/add): Merge conflict in include/auth.php Auto-merging include/auth.php CONFLICT (add/add): Merge conflict in images/index.php Auto-merging images/index.php CONFLICT (add/add): Merge conflict in images/cacti_logo_new.gif Auto-merging images/cacti_logo_new.gif CONFLICT (add/add): Merge conflict in images/cacti_logo.gif Auto-merging images/cacti_logo.gif CONFLICT (add/add): Merge conflict in host_templates.php Auto-merging host_templates.php CONFLICT (add/add): Merge conflict in host.php Auto-merging host.php CONFLICT (add/add): Merge conflict in graphs_new.php Auto-merging graphs_new.php CONFLICT (add/add): Merge conflict in graphs_items.php Auto-merging graphs_items.php CONFLICT (add/add): Merge conflict in graphs.php Auto-merging graphs.php CONFLICT (add/add): Merge conflict in graph_xport.php Auto-merging graph_xport.php CONFLICT (add/add): Merge conflict in graph_view.php Auto-merging graph_view.php CONFLICT (add/add): Merge conflict in graph_templates_items.php Auto-merging graph_templates_items.php CONFLICT (add/add): Merge conflict in graph_templates_inputs.php Auto-merging graph_templates_inputs.php CONFLICT (add/add): Merge conflict in graph_templates.php Auto-merging graph_templates.php CONFLICT (add/add): Merge conflict in graph_realtime.php Auto-merging graph_realtime.php CONFLICT (add/add): Merge conflict in graph_json.php Auto-merging graph_json.php CONFLICT (add/add): Merge conflict in graph_image.php Auto-merging graph_image.php CONFLICT (add/add): Merge conflict in graph.php Auto-merging graph.php CONFLICT (add/add): Merge conflict in gprint_presets.php Auto-merging gprint_presets.php CONFLICT (add/add): Merge conflict in formats/index.php Auto-merging formats/index.php CONFLICT (add/add): Merge conflict in formats/cacti_monitor.format Auto-merging formats/cacti_monitor.format CONFLICT (add/add): Merge conflict in formats/cacti_group_dark.format Auto-merging formats/cacti_group_dark.format CONFLICT (add/add): Merge conflict in formats/cacti_group.format Auto-merging formats/cacti_group.format CONFLICT (add/add): Merge conflict in docs/index.php Auto-merging docs/index.php CONFLICT (add/add): Merge conflict in docs/audit_schema.sql Auto-merging docs/audit_schema.sql CONFLICT (add/add): Merge conflict in docs/README.md Auto-merging docs/README.md CONFLICT (add/add): Merge conflict in data_templates.php Auto-merging data_templates.php CONFLICT (add/add): Merge conflict in data_sources.php Auto-merging data_sources.php CONFLICT (add/add): Merge conflict in data_source_profiles.php Auto-merging data_source_profiles.php CONFLICT (add/add): Merge conflict in data_queries.php Auto-merging data_queries.php CONFLICT (add/add): Merge conflict in data_input.php Auto-merging data_input.php CONFLICT (add/add): Merge conflict in data_debug.php Auto-merging data_debug.php CONFLICT (add/add): Merge conflict in color_templates_items.php Auto-merging color_templates_items.php CONFLICT (add/add): Merge conflict in color_templates.php Auto-merging color_templates.php CONFLICT (add/add): Merge conflict in color.php Auto-merging color.php CONFLICT (add/add): Merge conflict in cmd_realtime.php Auto-merging cmd_realtime.php CONFLICT (add/add): Merge conflict in cmd.php Auto-merging cmd.php CONFLICT (add/add): Merge conflict in clog_user.php Auto-merging clog_user.php CONFLICT (add/add): Merge conflict in clog.php Auto-merging clog.php CONFLICT (add/add): Merge conflict in cli/version.php Auto-merging cli/version.php CONFLICT (add/add): Merge conflict in cli/upgrade_database.php Auto-merging cli/upgrade_database.php CONFLICT (add/add): Merge conflict in cli/structure_rra_paths.php Auto-merging cli/structure_rra_paths.php CONFLICT (add/add): Merge conflict in cli/sqltable_to_php.php Auto-merging cli/sqltable_to_php.php CONFLICT (add/add): Merge conflict in cli/splice_rrd.php Auto-merging cli/splice_rrd.php CONFLICT (add/add): Merge conflict in cli/show_perms.php Auto-merging cli/show_perms.php CONFLICT (add/add): Merge conflict in cli/rrdresize.php Auto-merging cli/rrdresize.php CONFLICT (add/add): Merge conflict in cli/repair_templates.php Auto-merging cli/repair_templates.php CONFLICT (add/add): Merge conflict in cli/repair_graphs.php Auto-merging cli/repair_graphs.php CONFLICT (add/add): Merge conflict in cli/repair_database.php Auto-merging cli/repair_database.php CONFLICT (add/add): Merge conflict in cli/reorder_data_query.php Auto-merging cli/reorder_data_query.php CONFLICT (add/add): Merge conflict in cli/removespikes.php Auto-merging cli/removespikes.php CONFLICT (add/add): Merge conflict in cli/remove_graphs.php Auto-merging cli/remove_graphs.php CONFLICT (add/add): Merge conflict in cli/remove_device.php Auto-merging cli/remove_device.php CONFLICT (add/add): Merge conflict in cli/refresh_csrf.php Auto-merging cli/refresh_csrf.php CONFLICT (add/add): Merge conflict in cli/rebuild_poller_cache.php Auto-merging cli/rebuild_poller_cache.php CONFLICT (add/add): Merge conflict in cli/poller_replicate.php Auto-merging cli/poller_replicate.php CONFLICT (add/add): Merge conflict in cli/poller_reindex_hosts.php Auto-merging cli/poller_reindex_hosts.php CONFLICT (add/add): Merge conflict in cli/poller_output_empty.php Auto-merging cli/poller_output_empty.php CONFLICT (add/add): Merge conflict in cli/poller_graphs_reapply_names.php Auto-merging cli/poller_graphs_reapply_names.php CONFLICT (add/add): Merge conflict in cli/poller_data_sources_reapply_names.php Auto-merging cli/poller_data_sources_reapply_names.php CONFLICT (add/add): Merge conflict in cli/md5sum.php Auto-merging cli/md5sum.php CONFLICT (add/add): Merge conflict in cli/install_cacti.php Auto-merging cli/install_cacti.php CONFLICT (add/add): Merge conflict in cli/input_whitelist.php Auto-merging cli/input_whitelist.php CONFLICT (add/add): Merge conflict in cli/index.php Auto-merging cli/index.php CONFLICT (add/add): Merge conflict in cli/import_template.php Auto-merging cli/import_template.php CONFLICT (add/add): Merge conflict in cli/import_package.php Auto-merging cli/import_package.php CONFLICT (add/add): Merge conflict in cli/host_update_template.php Auto-merging cli/host_update_template.php CONFLICT (add/add): Merge conflict in cli/fix_mediumint.php Auto-merging cli/fix_mediumint.php CONFLICT (add/add): Merge conflict in cli/copy_user.php Auto-merging cli/copy_user.php CONFLICT (add/add): Merge conflict in cli/convert_tables.php Auto-merging cli/convert_tables.php CONFLICT (add/add): Merge conflict in cli/change_device.php Auto-merging cli/change_device.php CONFLICT (add/add): Merge conflict in cli/audit_database.php Auto-merging cli/audit_database.php CONFLICT (add/add): Merge conflict in cli/apply_automation_rules.php Auto-merging cli/apply_automation_rules.php CONFLICT (add/add): Merge conflict in cli/analyze_database.php Auto-merging cli/analyze_database.php CONFLICT (add/add): Merge conflict in cli/add_tree.php Auto-merging cli/add_tree.php CONFLICT (add/add): Merge conflict in cli/add_site.php Auto-merging cli/add_site.php CONFLICT (add/add): Merge conflict in cli/add_perms.php Auto-merging cli/add_perms.php CONFLICT (add/add): Merge conflict in cli/add_graphs.php Auto-merging cli/add_graphs.php CONFLICT (add/add): Merge conflict in cli/add_graph_template.php Auto-merging cli/add_graph_template.php CONFLICT (add/add): Merge conflict in cli/add_device.php Auto-merging cli/add_device.php CONFLICT (add/add): Merge conflict in cli/add_datasource.php Auto-merging cli/add_datasource.php CONFLICT (add/add): Merge conflict in cli/add_data_query.php Auto-merging cli/add_data_query.php CONFLICT (add/add): Merge conflict in changelog.php Auto-merging changelog.php CONFLICT (add/add): Merge conflict in cdef.php Auto-merging cdef.php CONFLICT (add/add): Merge conflict in cactid.php Auto-merging cactid.php CONFLICT (add/add): Merge conflict in cacti.sql Auto-merging cacti.sql CONFLICT (add/add): Merge conflict in boost_rrdupdate.php Auto-merging boost_rrdupdate.php CONFLICT (add/add): Merge conflict in automation_tree_rules.php Auto-merging automation_tree_rules.php CONFLICT (add/add): Merge conflict in automation_templates.php Auto-merging automation_templates.php CONFLICT (add/add): Merge conflict in automation_snmp.php Auto-merging automation_snmp.php CONFLICT (add/add): Merge conflict in automation_networks.php Auto-merging automation_networks.php CONFLICT (add/add): Merge conflict in automation_graph_rules.php Auto-merging automation_graph_rules.php CONFLICT (add/add): Merge conflict in automation_devices.php Auto-merging automation_devices.php CONFLICT (add/add): Merge conflict in auth_profile.php Auto-merging auth_profile.php CONFLICT (add/add): Merge conflict in auth_login.php Auto-merging auth_login.php CONFLICT (add/add): Merge conflict in auth_changepassword.php Auto-merging auth_changepassword.php CONFLICT (add/add): Merge conflict in auth_2fa.php Auto-merging auth_2fa.php CONFLICT (add/add): Merge conflict in aggregate_templates.php Auto-merging aggregate_templates.php CONFLICT (add/add): Merge conflict in aggregate_items.php Auto-merging aggregate_items.php CONFLICT (add/add): Merge conflict in aggregate_graphs.php Auto-merging aggregate_graphs.php CONFLICT (add/add): Merge conflict in about.php Auto-merging about.php CONFLICT (add/add): Merge conflict in README.md Auto-merging README.md CONFLICT (add/add): Merge conflict in LICENSE Auto-merging LICENSE CONFLICT (add/add): Merge conflict in CHANGELOG Auto-merging CHANGELOG CONFLICT (add/add): Merge conflict in .travis.yml Auto-merging .travis.yml CONFLICT (add/add): Merge conflict in .gitignore Auto-merging .gitignore CONFLICT (add/add): Merge conflict in .github/ISSUE_TEMPLATE/feature_request.md Auto-merging .github/ISSUE_TEMPLATE/feature_request.md CONFLICT (add/add): Merge conflict in .github/ISSUE_TEMPLATE/bug_report.md Auto-merging .github/ISSUE_TEMPLATE/bug_report.md error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 Correct header shebang Resolve all conflicts manually, mark them as resolved with "git add/rm <conflicted_files>", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort". (1)a year ago
First, rewinding head to replay your work on top of it... Applying: Correct header shebang .git/rebase-apply/patch:4106: trailing whitespace. With that said, there are several changes that you MUST perform to MySQL/MariaDB .git/rebase-apply/patch:4160: trailing whitespace. do .git/rebase-apply/patch:4269: trailing whitespace. ### Check out the Cacti Group's Official YouTube channel .git/rebase-apply/patch:4425: trailing whitespace. If a vulnerability is reproducible with evidence, please .git/rebase-apply/patch:4426: trailing whitespace. contact us on [email protected]. We would appreciate warning: squelched 2355 whitespace errors warning: 2360 lines add whitespace errors. Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. warning: Cannot merge binary files: locales/LC_MESSAGES/zh-TW.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/zh-CN.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/vi-VN.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/tr-TR.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/sv-SE.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/ru-RU.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/pt-PT.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/pt-BR.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/pl-PL.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/nl-NL.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/ko-KR.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/ja-JP.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/it-IT.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/hi-IN.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/he-IL.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/fr-FR.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/es-ES.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/el-GR.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/de-DE.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/bg-BG.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/ar-SA.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: install/templates/Windows_Device.xml.gz (HEAD vs. Correct header shebang) warning: Cannot merge binary files: install/templates/NetSNMP_Device.xml.gz (HEAD vs. Correct header shebang) warning: Cannot merge binary files: install/templates/Local_Linux_Machine.xml.gz (HEAD vs. Correct header shebang) warning: Cannot merge binary files: install/templates/Generic_SNMP_Device.xml.gz (HEAD vs. Correct header shebang) warning: Cannot merge binary files: install/templates/Cisco_Router.xml.gz (HEAD vs. Correct header shebang) warning: Cannot merge binary files: install/templates/Cacti_Stats.xml.gz (HEAD vs. Correct header shebang) warning: Cannot merge binary files: images/cacti_logo_new.gif (HEAD vs. Correct header shebang) warning: Cannot merge binary files: images/cacti_logo.gif (HEAD vs. Correct header shebang) CONFLICT (add/add): Merge conflict in vdef.php Auto-merging vdef.php CONFLICT (add/add): Merge conflict in utilities.php Auto-merging utilities.php CONFLICT (add/add): Merge conflict in user_group_admin.php Auto-merging user_group_admin.php CONFLICT (add/add): Merge conflict in user_domains.php Auto-merging user_domains.php CONFLICT (add/add): Merge conflict in user_admin.php Auto-merging user_admin.php CONFLICT (add/add): Merge conflict in tree.php Auto-merging tree.php CONFLICT (add/add): Merge conflict in tests/tools/check_install_code.php Auto-merging tests/tools/check_install_code.php CONFLICT (add/add): Merge conflict in tests/tools/check_cli_version.sh Auto-merging tests/tools/check_cli_version.sh CONFLICT (add/add): Merge conflict in tests/tools/check_all_pages.sh Auto-merging tests/tools/check_all_pages.sh CONFLICT (add/add): Merge conflict in tests/tools/cacti.conf Auto-merging tests/tools/cacti.conf CONFLICT (add/add): Merge conflict in templates_import.php Auto-merging templates_import.php CONFLICT (add/add): Merge conflict in templates_export.php Auto-merging templates_export.php CONFLICT (add/add): Merge conflict in support.php Auto-merging support.php CONFLICT (add/add): Merge conflict in spikekill.php Auto-merging spikekill.php CONFLICT (add/add): Merge conflict in snmpagent_persist.php Auto-merging snmpagent_persist.php CONFLICT (add/add): Merge conflict in snmpagent_mibcachechild.php Auto-merging snmpagent_mibcachechild.php CONFLICT (add/add): Merge conflict in snmpagent_mibcache.php Auto-merging snmpagent_mibcache.php CONFLICT (add/add): Merge conflict in sites.php Auto-merging sites.php CONFLICT (add/add): Merge conflict in settings.php Auto-merging settings.php CONFLICT (add/add): Merge conflict in service/README.md Auto-merging service/README.md CONFLICT (add/add): Merge conflict in scripts/weatherbug.pl Auto-merging scripts/weatherbug.pl CONFLICT (add/add): Merge conflict in scripts/ss_webseer.php Auto-merging scripts/ss_webseer.php CONFLICT (add/add): Merge conflict in scripts/ss_sql.php Auto-merging scripts/ss_sql.php CONFLICT (add/add): Merge conflict in scripts/ss_poller.php Auto-merging scripts/ss_poller.php CONFLICT (add/add): Merge conflict in scripts/ss_net_snmp_disk_io.php Auto-merging scripts/ss_net_snmp_disk_io.php CONFLICT (add/add): Merge conflict in scripts/ss_net_snmp_disk_bytes.php Auto-merging scripts/ss_net_snmp_disk_bytes.php CONFLICT (add/add): Merge conflict in scripts/ss_hstats.php Auto-merging scripts/ss_hstats.php CONFLICT (add/add): Merge conflict in scripts/ss_host_disk.php Auto-merging scripts/ss_host_disk.php CONFLICT (add/add): Merge conflict in scripts/ss_host_cpu.php Auto-merging scripts/ss_host_cpu.php CONFLICT (add/add): Merge conflict in scripts/ss_gexport.php Auto-merging scripts/ss_gexport.php CONFLICT (add/add): Merge conflict in scripts/ss_fping.php Auto-merging scripts/ss_fping.php CONFLICT (add/add): Merge conflict in scripts/ss_cpoller.php Auto-merging scripts/ss_cpoller.php CONFLICT (add/add): Merge conflict in scripts/ss_count_oids.php Auto-merging scripts/ss_count_oids.php CONFLICT (add/add): Merge conflict in scripts/cacti_user_stats.php Auto-merging scripts/cacti_user_stats.php CONFLICT (add/add): Merge conflict in script_server.php Auto-merging script_server.php CONFLICT (add/add): Merge conflict in rrdcleaner.php Auto-merging rrdcleaner.php CONFLICT (add/add): Merge conflict in resource/snmp_queries/interface.xml Auto-merging resource/snmp_queries/interface.xml CONFLICT (add/add): Merge conflict in resource/script_server/webseer.xml Auto-merging resource/script_server/webseer.xml CONFLICT (add/add): Merge conflict in resource/script_server/host_disk.xml Auto-merging resource/script_server/host_disk.xml CONFLICT (add/add): Merge conflict in resource/script_server/host_cpu.xml Auto-merging resource/script_server/host_cpu.xml CONFLICT (add/add): Merge conflict in resource/script_server/gexport.xml Auto-merging resource/script_server/gexport.xml CONFLICT (add/add): Merge conflict in resource/script_server/cpoller.xml Auto-merging resource/script_server/cpoller.xml CONFLICT (add/add): Merge conflict in resource/script_queries/unix_disk.xml Auto-merging resource/script_queries/unix_disk.xml CONFLICT (add/add): Merge conflict in resource/script_queries/host_disk.xml Auto-merging resource/script_queries/host_disk.xml CONFLICT (add/add): Merge conflict in resource/script_queries/host_cpu.xml Auto-merging resource/script_queries/host_cpu.xml CONFLICT (add/add): Merge conflict in reports_user.php Auto-merging reports_user.php CONFLICT (add/add): Merge conflict in reports_admin.php Auto-merging reports_admin.php CONFLICT (add/add): Merge conflict in remote_agent.php Auto-merging remote_agent.php CONFLICT (add/add): Merge conflict in pollers.php Auto-merging pollers.php CONFLICT (add/add): Merge conflict in poller_spikekill.php Auto-merging poller_spikekill.php CONFLICT (add/add): Merge conflict in poller_reports.php Auto-merging poller_reports.php CONFLICT (add/add): Merge conflict in poller_recovery.php Auto-merging poller_recovery.php CONFLICT (add/add): Merge conflict in poller_realtime.php Auto-merging poller_realtime.php CONFLICT (add/add): Merge conflict in poller_maintenance.php Auto-merging poller_maintenance.php CONFLICT (add/add): Merge conflict in poller_dsstats.php Auto-merging poller_dsstats.php CONFLICT (add/add): Merge conflict in poller_commands.php Auto-merging poller_commands.php CONFLICT (add/add): Merge conflict in poller_boost.php Auto-merging poller_boost.php CONFLICT (add/add): Merge conflict in poller_automation.php Auto-merging poller_automation.php CONFLICT (add/add): Merge conflict in poller.php Auto-merging poller.php CONFLICT (add/add): Merge conflict in plugins.php Auto-merging plugins.php CONFLICT (add/add): Merge conflict in permission_denied.php Auto-merging permission_denied.php CONFLICT (add/add): Merge conflict in mibs/CACTI-SNMPAGENT-MIB Auto-merging mibs/CACTI-SNMPAGENT-MIB CONFLICT (add/add): Merge conflict in mibs/CACTI-MIB Auto-merging mibs/CACTI-MIB CONFLICT (add/add): Merge conflict in mibs/CACTI-BOOST-MIB Auto-merging mibs/CACTI-BOOST-MIB CONFLICT (add/add): Merge conflict in managers.php Auto-merging managers.php CONFLICT (add/add): Merge conflict in logout.php Auto-merging logout.php CONFLICT (add/add): Merge conflict in locales/po/zh-TW.po Auto-merging locales/po/zh-TW.po CONFLICT (add/add): Merge conflict in locales/po/zh-CN.po Auto-merging locales/po/zh-CN.po CONFLICT (add/add): Merge conflict in locales/po/vi-VN.po Auto-merging locales/po/vi-VN.po CONFLICT (add/add): Merge conflict in locales/po/tr-TR.po Auto-merging locales/po/tr-TR.po CONFLICT (add/add): Merge conflict in locales/po/sv-SE.po Auto-merging locales/po/sv-SE.po CONFLICT (add/add): Merge conflict in locales/po/ru-RU.po Auto-merging locales/po/ru-RU.po CONFLICT (add/add): Merge conflict in locales/po/pt-PT.po Auto-merging locales/po/pt-PT.po CONFLICT (add/add): Merge conflict in locales/po/pt-BR.po Auto-merging locales/po/pt-BR.po CONFLICT (add/add): Merge conflict in locales/po/pl-PL.po Auto-merging locales/po/pl-PL.po CONFLICT (add/add): Merge conflict in locales/po/nl-NL.po Auto-merging locales/po/nl-NL.po CONFLICT (add/add): Merge conflict in locales/po/ko-KR.po Auto-merging locales/po/ko-KR.po CONFLICT (add/add): Merge conflict in locales/po/ja-JP.po Auto-merging locales/po/ja-JP.po CONFLICT (add/add): Merge conflict in locales/po/it-IT.po Auto-merging locales/po/it-IT.po CONFLICT (add/add): Merge conflict in locales/po/hi-IN.po Auto-merging locales/po/hi-IN.po CONFLICT (add/add): Merge conflict in locales/po/he-IL.po Auto-merging locales/po/he-IL.po CONFLICT (add/add): Merge conflict in locales/po/fr-FR.po Auto-merging locales/po/fr-FR.po CONFLICT (add/add): Merge conflict in locales/po/es-ES.po Auto-merging locales/po/es-ES.po CONFLICT (add/add): Merge conflict in locales/po/el-GR.po Auto-merging locales/po/el-GR.po CONFLICT (add/add): Merge conflict in locales/po/de-DE.po Auto-merging locales/po/de-DE.po CONFLICT (add/add): Merge conflict in locales/po/cacti.pot Auto-merging locales/po/cacti.pot CONFLICT (add/add): Merge conflict in locales/po/bg-BG.po Auto-merging locales/po/bg-BG.po CONFLICT (add/add): Merge conflict in locales/po/ar-SA.po Auto-merging locales/po/ar-SA.po CONFLICT (add/add): Merge conflict in locales/build_gettext.sh Auto-merging locales/build_gettext.sh CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/zh-TW.mo Auto-merging locales/LC_MESSAGES/zh-TW.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/zh-CN.mo Auto-merging locales/LC_MESSAGES/zh-CN.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/vi-VN.mo Auto-merging locales/LC_MESSAGES/vi-VN.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/tr-TR.mo Auto-merging locales/LC_MESSAGES/tr-TR.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/sv-SE.mo Auto-merging locales/LC_MESSAGES/sv-SE.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/ru-RU.mo Auto-merging locales/LC_MESSAGES/ru-RU.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/pt-PT.mo Auto-merging locales/LC_MESSAGES/pt-PT.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/pt-BR.mo Auto-merging locales/LC_MESSAGES/pt-BR.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/pl-PL.mo Auto-merging locales/LC_MESSAGES/pl-PL.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/nl-NL.mo Auto-merging locales/LC_MESSAGES/nl-NL.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/ko-KR.mo Auto-merging locales/LC_MESSAGES/ko-KR.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/ja-JP.mo Auto-merging locales/LC_MESSAGES/ja-JP.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/it-IT.mo Auto-merging locales/LC_MESSAGES/it-IT.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/hi-IN.mo Auto-merging locales/LC_MESSAGES/hi-IN.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/he-IL.mo Auto-merging locales/LC_MESSAGES/he-IL.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/fr-FR.mo Auto-merging locales/LC_MESSAGES/fr-FR.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/es-ES.mo Auto-merging locales/LC_MESSAGES/es-ES.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/el-GR.mo Auto-merging locales/LC_MESSAGES/el-GR.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/de-DE.mo Auto-merging locales/LC_MESSAGES/de-DE.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/bg-BG.mo Auto-merging locales/LC_MESSAGES/bg-BG.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/ar-SA.mo Auto-merging locales/LC_MESSAGES/ar-SA.mo CONFLICT (add/add): Merge conflict in links.php Auto-merging links.php CONFLICT (add/add): Merge conflict in link.php Auto-merging link.php CONFLICT (add/add): Merge conflict in lib/xml.php Auto-merging lib/xml.php CONFLICT (add/add): Merge conflict in lib/vdef.php Auto-merging lib/vdef.php CONFLICT (add/add): Merge conflict in lib/variables.php Auto-merging lib/variables.php CONFLICT (add/add): Merge conflict in lib/utility.php Auto-merging lib/utility.php CONFLICT (add/add): Merge conflict in lib/timespan_settings.php Auto-merging lib/timespan_settings.php CONFLICT (add/add): Merge conflict in lib/time.php Auto-merging lib/time.php CONFLICT (add/add): Merge conflict in lib/template.php Auto-merging lib/template.php CONFLICT (add/add): Merge conflict in lib/spikekill.php Auto-merging lib/spikekill.php CONFLICT (add/add): Merge conflict in lib/sort.php Auto-merging lib/sort.php CONFLICT (add/add): Merge conflict in lib/snmpagent.php Auto-merging lib/snmpagent.php CONFLICT (add/add): Merge conflict in lib/snmp.php Auto-merging lib/snmp.php CONFLICT (add/add): Merge conflict in lib/rrd.php Auto-merging lib/rrd.php CONFLICT (add/add): Merge conflict in lib/reports.php Auto-merging lib/reports.php CONFLICT (add/add): Merge conflict in lib/poller.php Auto-merging lib/poller.php CONFLICT (add/add): Merge conflict in lib/plugins.php Auto-merging lib/plugins.php CONFLICT (add/add): Merge conflict in lib/ping.php Auto-merging lib/ping.php CONFLICT (add/add): Merge conflict in lib/mib_cache.php Auto-merging lib/mib_cache.php CONFLICT (add/add): Merge conflict in lib/ldap.php Auto-merging lib/ldap.php CONFLICT (add/add): Merge conflict in lib/installer.php Auto-merging lib/installer.php CONFLICT (add/add): Merge conflict in lib/import.php Auto-merging lib/import.php CONFLICT (add/add): Merge conflict in lib/html_validate.php Auto-merging lib/html_validate.php CONFLICT (add/add): Merge conflict in lib/html_utility.php Auto-merging lib/html_utility.php CONFLICT (add/add): Merge conflict in lib/html_tree.php Auto-merging lib/html_tree.php CONFLICT (add/add): Merge conflict in lib/html_reports.php Auto-merging lib/html_reports.php CONFLICT (add/add): Merge conflict in lib/html_graph.php Auto-merging lib/html_graph.php CONFLICT (add/add): Merge conflict in lib/html_form_template.php Auto-merging lib/html_form_template.php CONFLICT (add/add): Merge conflict in lib/html_form.php Auto-merging lib/html_form.php CONFLICT (add/add): Merge conflict in lib/html_filter.php Auto-merging lib/html_filter.php CONFLICT (add/add): Merge conflict in lib/html.php Auto-merging lib/html.php CONFLICT (add/add): Merge conflict in lib/graphs.php Auto-merging lib/graphs.php CONFLICT (add/add): Merge conflict in lib/graph_variables.php Auto-merging lib/graph_variables.php CONFLICT (add/add): Merge conflict in lib/functions.php Auto-merging lib/functions.php CONFLICT (add/add): Merge conflict in lib/export.php Auto-merging lib/export.php CONFLICT (add/add): Merge conflict in lib/dsstats.php Auto-merging lib/dsstats.php CONFLICT (add/add): Merge conflict in lib/dsdebug.php Auto-merging lib/dsdebug.php CONFLICT (add/add): Merge conflict in lib/database.php Auto-merging lib/database.php CONFLICT (add/add): Merge conflict in lib/data_query.php Auto-merging lib/data_query.php CONFLICT (add/add): Merge conflict in lib/clog_webapi.php Auto-merging lib/clog_webapi.php CONFLICT (add/add): Merge conflict in lib/cdef.php Auto-merging lib/cdef.php CONFLICT (add/add): Merge conflict in lib/boost.php Auto-merging lib/boost.php CONFLICT (add/add): Merge conflict in lib/auth.php Auto-merging lib/auth.php CONFLICT (add/add): Merge conflict in lib/api_tree.php Auto-merging lib/api_tree.php CONFLICT (add/add): Merge conflict in lib/api_poller.php Auto-merging lib/api_poller.php CONFLICT (add/add): Merge conflict in lib/api_graph.php Auto-merging lib/api_graph.php CONFLICT (add/add): Merge conflict in lib/api_device.php Auto-merging lib/api_device.php CONFLICT (add/add): Merge conflict in lib/api_data_source.php Auto-merging lib/api_data_source.php CONFLICT (add/add): Merge conflict in lib/api_automation_tools.php Auto-merging lib/api_automation_tools.php CONFLICT (add/add): Merge conflict in lib/api_automation.php Auto-merging lib/api_automation.php CONFLICT (add/add): Merge conflict in lib/api_aggregate.php Auto-merging lib/api_aggregate.php CONFLICT (add/add): Merge conflict in lib/aggregate.php Auto-merging lib/aggregate.php CONFLICT (add/add): Merge conflict in install/upgrades/1_3_0.php Auto-merging install/upgrades/1_3_0.php CONFLICT (add/add): Merge conflict in install/upgrades/1_2_8.php Auto-merging install/upgrades/1_2_8.php CONFLICT (add/add): Merge conflict in install/upgrades/1_2_7.php Auto-merging install/upgrades/1_2_7.php CONFLICT (add/add): Merge conflict in install/upgrades/1_2_5.php Auto-merging install/upgrades/1_2_5.php CONFLICT (add/add): Merge conflict in install/upgrades/1_2_3.php Auto-merging install/upgrades/1_2_3.php CONFLICT (add/add): Merge conflict in install/upgrades/1_2_2.php Auto-merging install/upgrades/1_2_2.php CONFLICT (add/add): Merge conflict in install/upgrades/1_2_17.php Auto-merging install/upgrades/1_2_17.php CONFLICT (add/add): Merge conflict in install/upgrades/1_2_15.php Auto-merging install/upgrades/1_2_15.php CONFLICT (add/add): Merge conflict in install/upgrades/1_2_14.php Auto-merging install/upgrades/1_2_14.php CONFLICT (add/add): Merge conflict in install/upgrades/1_2_11.php Auto-merging install/upgrades/1_2_11.php CONFLICT (add/add): Merge conflict in install/upgrades/1_2_1.php Auto-merging install/upgrades/1_2_1.php CONFLICT (add/add): Merge conflict in install/upgrades/1_2_0.php Auto-merging install/upgrades/1_2_0.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_8.php Auto-merging install/upgrades/1_1_8.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_7.php Auto-merging install/upgrades/1_1_7.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_6.php Auto-merging install/upgrades/1_1_6.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_4.php Auto-merging install/upgrades/1_1_4.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_37.php Auto-merging install/upgrades/1_1_37.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_36.php Auto-merging install/upgrades/1_1_36.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_35.php Auto-merging install/upgrades/1_1_35.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_34.php Auto-merging install/upgrades/1_1_34.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_31.php Auto-merging install/upgrades/1_1_31.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_28.php Auto-merging install/upgrades/1_1_28.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_26.php Auto-merging install/upgrades/1_1_26.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_20.php Auto-merging install/upgrades/1_1_20.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_2.php Auto-merging install/upgrades/1_1_2.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_17.php Auto-merging install/upgrades/1_1_17.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_14.php Auto-merging install/upgrades/1_1_14.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_11.php Auto-merging install/upgrades/1_1_11.php CONFLICT (add/add): Merge conflict in install/upgrades/1_0_5.php Auto-merging install/upgrades/1_0_5.php CONFLICT (add/add): Merge conflict in install/upgrades/1_0_4.php Auto-merging install/upgrades/1_0_4.php CONFLICT (add/add): Merge conflict in install/upgrades/1_0_0.php Auto-merging install/upgrades/1_0_0.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_8.php Auto-merging install/upgrades/0_8_8.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_7h.php Auto-merging install/upgrades/0_8_7h.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_7c.php Auto-merging install/upgrades/0_8_7c.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_7b.php Auto-merging install/upgrades/0_8_7b.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_7a.php Auto-merging install/upgrades/0_8_7a.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_7.php Auto-merging install/upgrades/0_8_7.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_6i.php Auto-merging install/upgrades/0_8_6i.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_6h.php Auto-merging install/upgrades/0_8_6h.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_6g.php Auto-merging install/upgrades/0_8_6g.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_6e.php Auto-merging install/upgrades/0_8_6e.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_6d.php Auto-merging install/upgrades/0_8_6d.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_6a.php Auto-merging install/upgrades/0_8_6a.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_6.php Auto-merging install/upgrades/0_8_6.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_5.php Auto-merging install/upgrades/0_8_5.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_4.php Auto-merging install/upgrades/0_8_4.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_3.php Auto-merging install/upgrades/0_8_3.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_2a.php Auto-merging install/upgrades/0_8_2a.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_2.php Auto-merging install/upgrades/0_8_2.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_1.php Auto-merging install/upgrades/0_8_1.php CONFLICT (add/add): Merge conflict in install/templates/Windows_Device.xml.gz Auto-merging install/templates/Windows_Device.xml.gz CONFLICT (add/add): Merge conflict in install/templates/NetSNMP_Device.xml.gz Auto-merging install/templates/NetSNMP_Device.xml.gz CONFLICT (add/add): Merge conflict in install/templates/Local_Linux_Machine.xml.gz Auto-merging install/templates/Local_Linux_Machine.xml.gz CONFLICT (add/add): Merge conflict in install/templates/Generic_SNMP_Device.xml.gz Auto-merging install/templates/Generic_SNMP_Device.xml.gz CONFLICT (add/add): Merge conflict in install/templates/Cisco_Router.xml.gz Auto-merging install/templates/Cisco_Router.xml.gz CONFLICT (add/add): Merge conflict in install/templates/Cacti_Stats.xml.gz Auto-merging install/templates/Cacti_Stats.xml.gz CONFLICT (add/add): Merge conflict in install/step_json.php Auto-merging install/step_json.php CONFLICT (add/add): Merge conflict in install/install.php Auto-merging install/install.php CONFLICT (add/add): Merge conflict in install/install.js Auto-merging install/install.js CONFLICT (add/add): Merge conflict in install/install.css Auto-merging install/install.css CONFLICT (add/add): Merge conflict in install/index.php Auto-merging install/index.php CONFLICT (add/add): Merge conflict in install/functions.php Auto-merging install/functions.php CONFLICT (add/add): Merge conflict in install/cli_test.php Auto-merging install/cli_test.php CONFLICT (add/add): Merge conflict in install/cli_check.php Auto-merging install/cli_check.php CONFLICT (add/add): Merge conflict in install/background.php Auto-merging install/background.php CONFLICT (add/add): Merge conflict in index.php Auto-merging index.php CONFLICT (add/add): Merge conflict in include/vendor/phpsnmp/mib_parser.php Auto-merging include/vendor/phpsnmp/mib_parser.php CONFLICT (add/add): Merge conflict in include/vendor/phpsnmp/extension.php Auto-merging include/vendor/phpsnmp/extension.php CONFLICT (add/add): Merge conflict in include/vendor/phpsnmp/classSNMP.php Auto-merging include/vendor/phpsnmp/classSNMP.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/bootstrap.php Auto-merging include/vendor/phpseclib/bootstrap.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/System/SSH/Agent.php Auto-merging include/vendor/phpseclib/System/SSH/Agent.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/Net/SSH2.php Auto-merging include/vendor/phpseclib/Net/SSH2.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/Net/SFTP.php Auto-merging include/vendor/phpseclib/Net/SFTP.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/Math/BigInteger.php Auto-merging include/vendor/phpseclib/Math/BigInteger.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/File/X509.php Auto-merging include/vendor/phpseclib/File/X509.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/File/ASN1.php Auto-merging include/vendor/phpseclib/File/ASN1.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/Crypt/Twofish.php Auto-merging include/vendor/phpseclib/Crypt/Twofish.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/Crypt/Rijndael.php Auto-merging include/vendor/phpseclib/Crypt/Rijndael.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/Crypt/RSA.php Auto-merging include/vendor/phpseclib/Crypt/RSA.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/Crypt/RC2.php Auto-merging include/vendor/phpseclib/Crypt/RC2.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/Crypt/DES.php Auto-merging include/vendor/phpseclib/Crypt/DES.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/Crypt/Blowfish.php Auto-merging include/vendor/phpseclib/Crypt/Blowfish.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/Crypt/Base.php Auto-merging include/vendor/phpseclib/Crypt/Base.php CONFLICT (add/add): Merge conflict in include/vendor/gettext/tests/TranslatorTest.php Auto-merging include/vendor/gettext/tests/TranslatorTest.php CONFLICT (add/add): Merge conflict in include/vendor/gettext/src/translator_functions.php Auto-merging include/vendor/gettext/src/translator_functions.php CONFLICT (add/add): Merge conflict in include/vendor/gettext/CONTRIBUTING.md Auto-merging include/vendor/gettext/CONTRIBUTING.md CONFLICT (add/add): Merge conflict in include/vendor/csrf/csrf-conf.php Auto-merging include/vendor/csrf/csrf-conf.php CONFLICT (add/add): Merge conflict in include/vendor/cldr-to-gettext-plural-rules/bin/export-plural-rules Auto-merging include/vendor/cldr-to-gettext-plural-rules/bin/export-plural-rules CONFLICT (add/add): Merge conflict in include/vendor/GoogleAuthenticator/RuntimeException.php Auto-merging include/vendor/GoogleAuthenticator/RuntimeException.php CONFLICT (add/add): Merge conflict in include/vendor/GoogleAuthenticator/GoogleQrUrl.php Auto-merging include/vendor/GoogleAuthenticator/GoogleQrUrl.php CONFLICT (add/add): Merge conflict in include/vendor/GoogleAuthenticator/GoogleAuthenticatorInterface.php Auto-merging include/vendor/GoogleAuthenticator/GoogleAuthenticatorInterface.php CONFLICT (add/add): Merge conflict in include/vendor/GoogleAuthenticator/GoogleAuthenticator.php Auto-merging include/vendor/GoogleAuthenticator/GoogleAuthenticator.php CONFLICT (add/add): Merge conflict in include/vendor/GoogleAuthenticator/FixedBitNotation.php Auto-merging include/vendor/GoogleAuthenticator/FixedBitNotation.php CONFLICT (add/add): Merge conflict in include/top_header.php Auto-merging include/top_header.php CONFLICT (add/add): Merge conflict in include/top_graph_header.php Auto-merging include/top_graph_header.php CONFLICT (add/add): Merge conflict in include/top_general_header.php Auto-merging include/top_general_header.php CONFLICT (add/add): Merge conflict in include/themes/sunrise/main.js Auto-merging include/themes/sunrise/main.js CONFLICT (add/add): Merge conflict in include/themes/sunrise/main.css Auto-merging include/themes/sunrise/main.css CONFLICT (add/add): Merge conflict in include/themes/raspberry/main.js Auto-merging include/themes/raspberry/main.js CONFLICT (add/add): Merge conflict in include/themes/paw/main.js Auto-merging include/themes/paw/main.js CONFLICT (add/add): Merge conflict in include/themes/paw/main.css Auto-merging include/themes/paw/main.css CONFLICT (add/add): Merge conflict in include/themes/paw/jquery.timepicker.css Auto-merging include/themes/paw/jquery.timepicker.css CONFLICT (add/add): Merge conflict in include/themes/paper-plane/main.js Auto-merging include/themes/paper-plane/main.js CONFLICT (add/add): Merge conflict in include/themes/paper-plane/main.css Auto-merging include/themes/paper-plane/main.css CONFLICT (add/add): Merge conflict in include/themes/paper-plane/billboard.css Auto-merging include/themes/paper-plane/billboard.css CONFLICT (add/add): Merge conflict in include/themes/modern/main.js Auto-merging include/themes/modern/main.js CONFLICT (add/add): Merge conflict in include/themes/modern/main.css Auto-merging include/themes/modern/main.css CONFLICT (add/add): Merge conflict in include/themes/midwinter/rrdtheme.php Auto-merging include/themes/midwinter/rrdtheme.php CONFLICT (add/add): Merge conflict in include/themes/midwinter/pace.css Auto-merging include/themes/midwinter/pace.css CONFLICT (add/add): Merge conflict in include/themes/midwinter/main.js Auto-merging include/themes/midwinter/main.js CONFLICT (add/add): Merge conflict in include/themes/midwinter/main.css Auto-merging include/themes/midwinter/main.css CONFLICT (add/add): Merge conflict in include/themes/midwinter/jquery.zoom.css Auto-merging include/themes/midwinter/jquery.zoom.css CONFLICT (add/add): Merge conflict in include/themes/hollyberry/main.js Auto-merging include/themes/hollyberry/main.js CONFLICT (add/add): Merge conflict in include/themes/dark/main.js Auto-merging include/themes/dark/main.js CONFLICT (add/add): Merge conflict in include/themes/dark/main.css Auto-merging include/themes/dark/main.css CONFLICT (add/add): Merge conflict in include/themes/classic/main.css Auto-merging include/themes/classic/main.css CONFLICT (add/add): Merge conflict in include/themes/carrot/main.js Auto-merging include/themes/carrot/main.js CONFLICT (add/add): Merge conflict in include/themes/cacti/main.js Auto-merging include/themes/cacti/main.js CONFLICT (add/add): Merge conflict in include/session.php Auto-merging include/session.php CONFLICT (add/add): Merge conflict in include/realtime.js Auto-merging include/realtime.js CONFLICT (add/add): Merge conflict in include/plugins.php Auto-merging include/plugins.php CONFLICT (add/add): Merge conflict in include/layout.js Auto-merging include/layout.js CONFLICT (add/add): Merge conflict in include/js/pace.js Auto-merging include/js/pace.js CONFLICT (add/add): Merge conflict in include/js/jstree.js Auto-merging include/js/jstree.js CONFLICT (add/add): Merge conflict in include/js/jquery.zoom.js Auto-merging include/js/jquery.zoom.js CONFLICT (add/add): Merge conflict in include/js/jquery.multiselect.js Auto-merging include/js/jquery.multiselect.js CONFLICT (add/add): Merge conflict in include/js/jquery.js Auto-merging include/js/jquery.js CONFLICT (add/add): Merge conflict in include/js/jquery.dropdown.js Auto-merging include/js/jquery.dropdown.js CONFLICT (add/add): Merge conflict in include/js/jquery-ui.js Auto-merging include/js/jquery-ui.js CONFLICT (add/add): Merge conflict in include/js/billboard.js Auto-merging include/js/billboard.js CONFLICT (add/add): Merge conflict in include/global_settings.php Auto-merging include/global_settings.php CONFLICT (add/add): Merge conflict in include/global_session.php Auto-merging include/global_session.php CONFLICT (add/add): Merge conflict in include/global_languages.php Auto-merging include/global_languages.php CONFLICT (add/add): Merge conflict in include/global_form.php Auto-merging include/global_form.php CONFLICT (add/add): Merge conflict in include/global_constants.php Auto-merging include/global_constants.php CONFLICT (add/add): Merge conflict in include/global_arrays.php Auto-merging include/global_arrays.php CONFLICT (add/add): Merge conflict in include/global.php Auto-merging include/global.php CONFLICT (add/add): Merge conflict in include/fa/css/all.css Auto-merging include/fa/css/all.css CONFLICT (add/add): Merge conflict in include/csrf.php Auto-merging include/csrf.php CONFLICT (add/add): Merge conflict in include/config.php.dist Auto-merging include/config.php.dist CONFLICT (add/add): Merge conflict in include/cli_check.php Auto-merging include/cli_check.php CONFLICT (add/add): Merge conflict in include/bottom_footer.php Auto-merging include/bottom_footer.php CONFLICT (add/add): Merge conflict in include/auth.php Auto-merging include/auth.php CONFLICT (add/add): Merge conflict in images/cacti_logo_new.gif Auto-merging images/cacti_logo_new.gif CONFLICT (add/add): Merge conflict in images/cacti_logo.gif Auto-merging images/cacti_logo.gif CONFLICT (add/add): Merge conflict in host_templates.php Auto-merging host_templates.php CONFLICT (add/add): Merge conflict in host.php Auto-merging host.php CONFLICT (add/add): Merge conflict in graphs_new.php Auto-merging graphs_new.php CONFLICT (add/add): Merge conflict in graphs_items.php Auto-merging graphs_items.php CONFLICT (add/add): Merge conflict in graphs.php Auto-merging graphs.php CONFLICT (add/add): Merge conflict in graph_xport.php Auto-merging graph_xport.php CONFLICT (add/add): Merge conflict in graph_view.php Auto-merging graph_view.php CONFLICT (add/add): Merge conflict in graph_templates_items.php Auto-merging graph_templates_items.php CONFLICT (add/add): Merge conflict in graph_templates_inputs.php Auto-merging graph_templates_inputs.php CONFLICT (add/add): Merge conflict in graph_templates.php Auto-merging graph_templates.php CONFLICT (add/add): Merge conflict in graph_realtime.php Auto-merging graph_realtime.php CONFLICT (add/add): Merge conflict in graph_json.php Auto-merging graph_json.php CONFLICT (add/add): Merge conflict in graph_image.php Auto-merging graph_image.php CONFLICT (add/add): Merge conflict in graph.php Auto-merging graph.php CONFLICT (add/add): Merge conflict in gprint_presets.php Auto-merging gprint_presets.php CONFLICT (add/add): Merge conflict in formats/cacti_monitor.format Auto-merging formats/cacti_monitor.format CONFLICT (add/add): Merge conflict in formats/cacti_group_dark.format Auto-merging formats/cacti_group_dark.format CONFLICT (add/add): Merge conflict in formats/cacti_group.format Auto-merging formats/cacti_group.format CONFLICT (add/add): Merge conflict in docs/index.php Auto-merging docs/index.php CONFLICT (add/add): Merge conflict in docs/audit_schema.sql Auto-merging docs/audit_schema.sql CONFLICT (add/add): Merge conflict in docs/README.md Auto-merging docs/README.md CONFLICT (add/add): Merge conflict in data_templates.php Auto-merging data_templates.php CONFLICT (add/add): Merge conflict in data_sources.php Auto-merging data_sources.php CONFLICT (add/add): Merge conflict in data_source_profiles.php Auto-merging data_source_profiles.php CONFLICT (add/add): Merge conflict in data_queries.php Auto-merging data_queries.php CONFLICT (add/add): Merge conflict in data_input.php Auto-merging data_input.php CONFLICT (add/add): Merge conflict in data_debug.php Auto-merging data_debug.php CONFLICT (add/add): Merge conflict in color_templates_items.php Auto-merging color_templates_items.php CONFLICT (add/add): Merge conflict in color_templates.php Auto-merging color_templates.php CONFLICT (add/add): Merge conflict in color.php Auto-merging color.php CONFLICT (add/add): Merge conflict in cmd_realtime.php Auto-merging cmd_realtime.php CONFLICT (add/add): Merge conflict in cmd.php Auto-merging cmd.php CONFLICT (add/add): Merge conflict in clog_user.php Auto-merging clog_user.php CONFLICT (add/add): Merge conflict in clog.php Auto-merging clog.php CONFLICT (add/add): Merge conflict in cli/version.php Auto-merging cli/version.php CONFLICT (add/add): Merge conflict in cli/upgrade_database.php Auto-merging cli/upgrade_database.php CONFLICT (add/add): Merge conflict in cli/structure_rra_paths.php Auto-merging cli/structure_rra_paths.php CONFLICT (add/add): Merge conflict in cli/sqltable_to_php.php Auto-merging cli/sqltable_to_php.php CONFLICT (add/add): Merge conflict in cli/splice_rrd.php Auto-merging cli/splice_rrd.php CONFLICT (add/add): Merge conflict in cli/show_perms.php Auto-merging cli/show_perms.php CONFLICT (add/add): Merge conflict in cli/rrdresize.php Auto-merging cli/rrdresize.php CONFLICT (add/add): Merge conflict in cli/repair_templates.php Auto-merging cli/repair_templates.php CONFLICT (add/add): Merge conflict in cli/repair_graphs.php Auto-merging cli/repair_graphs.php CONFLICT (add/add): Merge conflict in cli/repair_database.php Auto-merging cli/repair_database.php CONFLICT (add/add): Merge conflict in cli/reorder_data_query.php Auto-merging cli/reorder_data_query.php CONFLICT (add/add): Merge conflict in cli/removespikes.php Auto-merging cli/removespikes.php CONFLICT (add/add): Merge conflict in cli/remove_graphs.php Auto-merging cli/remove_graphs.php CONFLICT (add/add): Merge conflict in cli/remove_device.php Auto-merging cli/remove_device.php CONFLICT (add/add): Merge conflict in cli/refresh_csrf.php Auto-merging cli/refresh_csrf.php CONFLICT (add/add): Merge conflict in cli/rebuild_poller_cache.php Auto-merging cli/rebuild_poller_cache.php CONFLICT (add/add): Merge conflict in cli/poller_replicate.php Auto-merging cli/poller_replicate.php CONFLICT (add/add): Merge conflict in cli/poller_reindex_hosts.php Auto-merging cli/poller_reindex_hosts.php CONFLICT (add/add): Merge conflict in cli/poller_output_empty.php Auto-merging cli/poller_output_empty.php CONFLICT (add/add): Merge conflict in cli/poller_graphs_reapply_names.php Auto-merging cli/poller_graphs_reapply_names.php CONFLICT (add/add): Merge conflict in cli/poller_data_sources_reapply_names.php Auto-merging cli/poller_data_sources_reapply_names.php CONFLICT (add/add): Merge conflict in cli/md5sum.php Auto-merging cli/md5sum.php CONFLICT (add/add): Merge conflict in cli/install_cacti.php Auto-merging cli/install_cacti.php CONFLICT (add/add): Merge conflict in cli/input_whitelist.php Auto-merging cli/input_whitelist.php CONFLICT (add/add): Merge conflict in cli/import_template.php Auto-merging cli/import_template.php CONFLICT (add/add): Merge conflict in cli/import_package.php Auto-merging cli/import_package.php CONFLICT (add/add): Merge conflict in cli/host_update_template.php Auto-merging cli/host_update_template.php CONFLICT (add/add): Merge conflict in cli/fix_mediumint.php Auto-merging cli/fix_mediumint.php CONFLICT (add/add): Merge conflict in cli/copy_user.php Auto-merging cli/copy_user.php CONFLICT (add/add): Merge conflict in cli/convert_tables.php Auto-merging cli/convert_tables.php CONFLICT (add/add): Merge conflict in cli/change_device.php Auto-merging cli/change_device.php CONFLICT (add/add): Merge conflict in cli/audit_database.php Auto-merging cli/audit_database.php CONFLICT (add/add): Merge conflict in cli/apply_automation_rules.php Auto-merging cli/apply_automation_rules.php CONFLICT (add/add): Merge conflict in cli/analyze_database.php Auto-merging cli/analyze_database.php CONFLICT (add/add): Merge conflict in cli/add_tree.php Auto-merging cli/add_tree.php CONFLICT (add/add): Merge conflict in cli/add_site.php Auto-merging cli/add_site.php CONFLICT (add/add): Merge conflict in cli/add_perms.php Auto-merging cli/add_perms.php CONFLICT (add/add): Merge conflict in cli/add_graphs.php Auto-merging cli/add_graphs.php CONFLICT (add/add): Merge conflict in cli/add_graph_template.php Auto-merging cli/add_graph_template.php CONFLICT (add/add): Merge conflict in cli/add_device.php Auto-merging cli/add_device.php CONFLICT (add/add): Merge conflict in cli/add_datasource.php Auto-merging cli/add_datasource.php CONFLICT (add/add): Merge conflict in cli/add_data_query.php Auto-merging cli/add_data_query.php CONFLICT (add/add): Merge conflict in changelog.php Auto-merging changelog.php CONFLICT (add/add): Merge conflict in cdef.php Auto-merging cdef.php CONFLICT (add/add): Merge conflict in cactid.php Auto-merging cactid.php CONFLICT (add/add): Merge conflict in cacti.sql Auto-merging cacti.sql CONFLICT (add/add): Merge conflict in boost_rrdupdate.php Auto-merging boost_rrdupdate.php CONFLICT (add/add): Merge conflict in automation_tree_rules.php Auto-merging automation_tree_rules.php CONFLICT (add/add): Merge conflict in automation_templates.php Auto-merging automation_templates.php CONFLICT (add/add): Merge conflict in automation_snmp.php Auto-merging automation_snmp.php CONFLICT (add/add): Merge conflict in automation_networks.php Auto-merging automation_networks.php CONFLICT (add/add): Merge conflict in automation_graph_rules.php Auto-merging automation_graph_rules.php CONFLICT (add/add): Merge conflict in automation_devices.php Auto-merging automation_devices.php CONFLICT (add/add): Merge conflict in auth_profile.php Auto-merging auth_profile.php CONFLICT (add/add): Merge conflict in auth_login.php Auto-merging auth_login.php CONFLICT (add/add): Merge conflict in auth_changepassword.php Auto-merging auth_changepassword.php CONFLICT (add/add): Merge conflict in auth_2fa.php Auto-merging auth_2fa.php CONFLICT (add/add): Merge conflict in aggregate_templates.php Auto-merging aggregate_templates.php CONFLICT (add/add): Merge conflict in aggregate_items.php Auto-merging aggregate_items.php CONFLICT (add/add): Merge conflict in aggregate_graphs.php Auto-merging aggregate_graphs.php CONFLICT (add/add): Merge conflict in about.php Auto-merging about.php CONFLICT (add/add): Merge conflict in README.md Auto-merging README.md CONFLICT (add/add): Merge conflict in LICENSE Auto-merging LICENSE CONFLICT (add/add): Merge conflict in CHANGELOG Auto-merging CHANGELOG CONFLICT (add/add): Merge conflict in .travis.yml Auto-merging .travis.yml CONFLICT (add/add): Merge conflict in .gitignore Auto-merging .gitignore error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 Correct header shebang Resolve all conflicts manually, mark them as resolved with "git add/rm <conflicted_files>", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort". (1)a year ago
First, rewinding head to replay your work on top of it... Applying: Correct header shebang .git/rebase-apply/patch:4106: trailing whitespace. With that said, there are several changes that you MUST perform to MySQL/MariaDB .git/rebase-apply/patch:4160: trailing whitespace. do .git/rebase-apply/patch:4269: trailing whitespace. ### Check out the Cacti Group's Official YouTube channel .git/rebase-apply/patch:4425: trailing whitespace. If a vulnerability is reproducible with evidence, please .git/rebase-apply/patch:4426: trailing whitespace. contact us on [email protected]. We would appreciate warning: squelched 2355 whitespace errors warning: 2360 lines add whitespace errors. Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. warning: Cannot merge binary files: locales/LC_MESSAGES/zh-TW.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/zh-CN.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/vi-VN.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/tr-TR.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/sv-SE.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/ru-RU.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/pt-PT.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/pt-BR.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/pl-PL.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/nl-NL.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/ko-KR.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/ja-JP.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/it-IT.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/hi-IN.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/he-IL.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/fr-FR.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/es-ES.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/el-GR.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/de-DE.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/bg-BG.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/ar-SA.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: install/templates/Windows_Device.xml.gz (HEAD vs. Correct header shebang) warning: Cannot merge binary files: install/templates/NetSNMP_Device.xml.gz (HEAD vs. Correct header shebang) warning: Cannot merge binary files: install/templates/Local_Linux_Machine.xml.gz (HEAD vs. Correct header shebang) warning: Cannot merge binary files: install/templates/Generic_SNMP_Device.xml.gz (HEAD vs. Correct header shebang) warning: Cannot merge binary files: install/templates/Cisco_Router.xml.gz (HEAD vs. Correct header shebang) warning: Cannot merge binary files: install/templates/Cacti_Stats.xml.gz (HEAD vs. Correct header shebang) warning: Cannot merge binary files: images/cacti_logo_new.gif (HEAD vs. Correct header shebang) warning: Cannot merge binary files: images/cacti_logo.gif (HEAD vs. Correct header shebang) CONFLICT (add/add): Merge conflict in vdef.php Auto-merging vdef.php CONFLICT (add/add): Merge conflict in utilities.php Auto-merging utilities.php CONFLICT (add/add): Merge conflict in user_group_admin.php Auto-merging user_group_admin.php CONFLICT (add/add): Merge conflict in user_domains.php Auto-merging user_domains.php CONFLICT (add/add): Merge conflict in user_admin.php Auto-merging user_admin.php CONFLICT (add/add): Merge conflict in tree.php Auto-merging tree.php CONFLICT (add/add): Merge conflict in tests/tools/check_install_code.php Auto-merging tests/tools/check_install_code.php CONFLICT (add/add): Merge conflict in tests/tools/check_cli_version.sh Auto-merging tests/tools/check_cli_version.sh CONFLICT (add/add): Merge conflict in tests/tools/check_all_pages.sh Auto-merging tests/tools/check_all_pages.sh CONFLICT (add/add): Merge conflict in tests/tools/cacti.conf Auto-merging tests/tools/cacti.conf CONFLICT (add/add): Merge conflict in templates_import.php Auto-merging templates_import.php CONFLICT (add/add): Merge conflict in templates_export.php Auto-merging templates_export.php CONFLICT (add/add): Merge conflict in support.php Auto-merging support.php CONFLICT (add/add): Merge conflict in spikekill.php Auto-merging spikekill.php CONFLICT (add/add): Merge conflict in snmpagent_persist.php Auto-merging snmpagent_persist.php CONFLICT (add/add): Merge conflict in snmpagent_mibcachechild.php Auto-merging snmpagent_mibcachechild.php CONFLICT (add/add): Merge conflict in snmpagent_mibcache.php Auto-merging snmpagent_mibcache.php CONFLICT (add/add): Merge conflict in sites.php Auto-merging sites.php CONFLICT (add/add): Merge conflict in settings.php Auto-merging settings.php CONFLICT (add/add): Merge conflict in service/README.md Auto-merging service/README.md CONFLICT (add/add): Merge conflict in scripts/weatherbug.pl Auto-merging scripts/weatherbug.pl CONFLICT (add/add): Merge conflict in scripts/ss_webseer.php Auto-merging scripts/ss_webseer.php CONFLICT (add/add): Merge conflict in scripts/ss_sql.php Auto-merging scripts/ss_sql.php CONFLICT (add/add): Merge conflict in scripts/ss_poller.php Auto-merging scripts/ss_poller.php CONFLICT (add/add): Merge conflict in scripts/ss_net_snmp_disk_io.php Auto-merging scripts/ss_net_snmp_disk_io.php CONFLICT (add/add): Merge conflict in scripts/ss_net_snmp_disk_bytes.php Auto-merging scripts/ss_net_snmp_disk_bytes.php CONFLICT (add/add): Merge conflict in scripts/ss_hstats.php Auto-merging scripts/ss_hstats.php CONFLICT (add/add): Merge conflict in scripts/ss_host_disk.php Auto-merging scripts/ss_host_disk.php CONFLICT (add/add): Merge conflict in scripts/ss_host_cpu.php Auto-merging scripts/ss_host_cpu.php CONFLICT (add/add): Merge conflict in scripts/ss_gexport.php Auto-merging scripts/ss_gexport.php CONFLICT (add/add): Merge conflict in scripts/ss_fping.php Auto-merging scripts/ss_fping.php CONFLICT (add/add): Merge conflict in scripts/ss_cpoller.php Auto-merging scripts/ss_cpoller.php CONFLICT (add/add): Merge conflict in scripts/ss_count_oids.php Auto-merging scripts/ss_count_oids.php CONFLICT (add/add): Merge conflict in scripts/cacti_user_stats.php Auto-merging scripts/cacti_user_stats.php CONFLICT (add/add): Merge conflict in script_server.php Auto-merging script_server.php CONFLICT (add/add): Merge conflict in rrdcleaner.php Auto-merging rrdcleaner.php CONFLICT (add/add): Merge conflict in resource/snmp_queries/interface.xml Auto-merging resource/snmp_queries/interface.xml CONFLICT (add/add): Merge conflict in resource/script_server/webseer.xml Auto-merging resource/script_server/webseer.xml CONFLICT (add/add): Merge conflict in resource/script_server/host_disk.xml Auto-merging resource/script_server/host_disk.xml CONFLICT (add/add): Merge conflict in resource/script_server/host_cpu.xml Auto-merging resource/script_server/host_cpu.xml CONFLICT (add/add): Merge conflict in resource/script_server/gexport.xml Auto-merging resource/script_server/gexport.xml CONFLICT (add/add): Merge conflict in resource/script_server/cpoller.xml Auto-merging resource/script_server/cpoller.xml CONFLICT (add/add): Merge conflict in resource/script_queries/unix_disk.xml Auto-merging resource/script_queries/unix_disk.xml CONFLICT (add/add): Merge conflict in resource/script_queries/host_disk.xml Auto-merging resource/script_queries/host_disk.xml CONFLICT (add/add): Merge conflict in resource/script_queries/host_cpu.xml Auto-merging resource/script_queries/host_cpu.xml CONFLICT (add/add): Merge conflict in reports_user.php Auto-merging reports_user.php CONFLICT (add/add): Merge conflict in reports_admin.php Auto-merging reports_admin.php CONFLICT (add/add): Merge conflict in remote_agent.php Auto-merging remote_agent.php CONFLICT (add/add): Merge conflict in pollers.php Auto-merging pollers.php CONFLICT (add/add): Merge conflict in poller_spikekill.php Auto-merging poller_spikekill.php CONFLICT (add/add): Merge conflict in poller_reports.php Auto-merging poller_reports.php CONFLICT (add/add): Merge conflict in poller_recovery.php Auto-merging poller_recovery.php CONFLICT (add/add): Merge conflict in poller_realtime.php Auto-merging poller_realtime.php CONFLICT (add/add): Merge conflict in poller_maintenance.php Auto-merging poller_maintenance.php CONFLICT (add/add): Merge conflict in poller_dsstats.php Auto-merging poller_dsstats.php CONFLICT (add/add): Merge conflict in poller_commands.php Auto-merging poller_commands.php CONFLICT (add/add): Merge conflict in poller_boost.php Auto-merging poller_boost.php CONFLICT (add/add): Merge conflict in poller_automation.php Auto-merging poller_automation.php CONFLICT (add/add): Merge conflict in poller.php Auto-merging poller.php CONFLICT (add/add): Merge conflict in plugins.php Auto-merging plugins.php CONFLICT (add/add): Merge conflict in permission_denied.php Auto-merging permission_denied.php CONFLICT (add/add): Merge conflict in mibs/CACTI-SNMPAGENT-MIB Auto-merging mibs/CACTI-SNMPAGENT-MIB CONFLICT (add/add): Merge conflict in mibs/CACTI-MIB Auto-merging mibs/CACTI-MIB CONFLICT (add/add): Merge conflict in mibs/CACTI-BOOST-MIB Auto-merging mibs/CACTI-BOOST-MIB CONFLICT (add/add): Merge conflict in managers.php Auto-merging managers.php CONFLICT (add/add): Merge conflict in logout.php Auto-merging logout.php CONFLICT (add/add): Merge conflict in locales/po/zh-TW.po Auto-merging locales/po/zh-TW.po CONFLICT (add/add): Merge conflict in locales/po/zh-CN.po Auto-merging locales/po/zh-CN.po CONFLICT (add/add): Merge conflict in locales/po/vi-VN.po Auto-merging locales/po/vi-VN.po CONFLICT (add/add): Merge conflict in locales/po/tr-TR.po Auto-merging locales/po/tr-TR.po CONFLICT (add/add): Merge conflict in locales/po/sv-SE.po Auto-merging locales/po/sv-SE.po CONFLICT (add/add): Merge conflict in locales/po/ru-RU.po Auto-merging locales/po/ru-RU.po CONFLICT (add/add): Merge conflict in locales/po/pt-PT.po Auto-merging locales/po/pt-PT.po CONFLICT (add/add): Merge conflict in locales/po/pt-BR.po Auto-merging locales/po/pt-BR.po CONFLICT (add/add): Merge conflict in locales/po/pl-PL.po Auto-merging locales/po/pl-PL.po CONFLICT (add/add): Merge conflict in locales/po/nl-NL.po Auto-merging locales/po/nl-NL.po CONFLICT (add/add): Merge conflict in locales/po/ko-KR.po Auto-merging locales/po/ko-KR.po CONFLICT (add/add): Merge conflict in locales/po/ja-JP.po Auto-merging locales/po/ja-JP.po CONFLICT (add/add): Merge conflict in locales/po/it-IT.po Auto-merging locales/po/it-IT.po CONFLICT (add/add): Merge conflict in locales/po/hi-IN.po Auto-merging locales/po/hi-IN.po CONFLICT (add/add): Merge conflict in locales/po/he-IL.po Auto-merging locales/po/he-IL.po CONFLICT (add/add): Merge conflict in locales/po/fr-FR.po Auto-merging locales/po/fr-FR.po CONFLICT (add/add): Merge conflict in locales/po/es-ES.po Auto-merging locales/po/es-ES.po CONFLICT (add/add): Merge conflict in locales/po/el-GR.po Auto-merging locales/po/el-GR.po CONFLICT (add/add): Merge conflict in locales/po/de-DE.po Auto-merging locales/po/de-DE.po CONFLICT (add/add): Merge conflict in locales/po/cacti.pot Auto-merging locales/po/cacti.pot CONFLICT (add/add): Merge conflict in locales/po/bg-BG.po Auto-merging locales/po/bg-BG.po CONFLICT (add/add): Merge conflict in locales/po/ar-SA.po Auto-merging locales/po/ar-SA.po CONFLICT (add/add): Merge conflict in locales/build_gettext.sh Auto-merging locales/build_gettext.sh CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/zh-TW.mo Auto-merging locales/LC_MESSAGES/zh-TW.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/zh-CN.mo Auto-merging locales/LC_MESSAGES/zh-CN.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/vi-VN.mo Auto-merging locales/LC_MESSAGES/vi-VN.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/tr-TR.mo Auto-merging locales/LC_MESSAGES/tr-TR.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/sv-SE.mo Auto-merging locales/LC_MESSAGES/sv-SE.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/ru-RU.mo Auto-merging locales/LC_MESSAGES/ru-RU.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/pt-PT.mo Auto-merging locales/LC_MESSAGES/pt-PT.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/pt-BR.mo Auto-merging locales/LC_MESSAGES/pt-BR.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/pl-PL.mo Auto-merging locales/LC_MESSAGES/pl-PL.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/nl-NL.mo Auto-merging locales/LC_MESSAGES/nl-NL.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/ko-KR.mo Auto-merging locales/LC_MESSAGES/ko-KR.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/ja-JP.mo Auto-merging locales/LC_MESSAGES/ja-JP.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/it-IT.mo Auto-merging locales/LC_MESSAGES/it-IT.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/hi-IN.mo Auto-merging locales/LC_MESSAGES/hi-IN.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/he-IL.mo Auto-merging locales/LC_MESSAGES/he-IL.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/fr-FR.mo Auto-merging locales/LC_MESSAGES/fr-FR.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/es-ES.mo Auto-merging locales/LC_MESSAGES/es-ES.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/el-GR.mo Auto-merging locales/LC_MESSAGES/el-GR.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/de-DE.mo Auto-merging locales/LC_MESSAGES/de-DE.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/bg-BG.mo Auto-merging locales/LC_MESSAGES/bg-BG.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/ar-SA.mo Auto-merging locales/LC_MESSAGES/ar-SA.mo CONFLICT (add/add): Merge conflict in links.php Auto-merging links.php CONFLICT (add/add): Merge conflict in link.php Auto-merging link.php CONFLICT (add/add): Merge conflict in lib/xml.php Auto-merging lib/xml.php CONFLICT (add/add): Merge conflict in lib/vdef.php Auto-merging lib/vdef.php CONFLICT (add/add): Merge conflict in lib/variables.php Auto-merging lib/variables.php CONFLICT (add/add): Merge conflict in lib/utility.php Auto-merging lib/utility.php CONFLICT (add/add): Merge conflict in lib/timespan_settings.php Auto-merging lib/timespan_settings.php CONFLICT (add/add): Merge conflict in lib/time.php Auto-merging lib/time.php CONFLICT (add/add): Merge conflict in lib/template.php Auto-merging lib/template.php CONFLICT (add/add): Merge conflict in lib/spikekill.php Auto-merging lib/spikekill.php CONFLICT (add/add): Merge conflict in lib/sort.php Auto-merging lib/sort.php CONFLICT (add/add): Merge conflict in lib/snmpagent.php Auto-merging lib/snmpagent.php CONFLICT (add/add): Merge conflict in lib/snmp.php Auto-merging lib/snmp.php CONFLICT (add/add): Merge conflict in lib/rrd.php Auto-merging lib/rrd.php CONFLICT (add/add): Merge conflict in lib/reports.php Auto-merging lib/reports.php CONFLICT (add/add): Merge conflict in lib/poller.php Auto-merging lib/poller.php CONFLICT (add/add): Merge conflict in lib/plugins.php Auto-merging lib/plugins.php CONFLICT (add/add): Merge conflict in lib/ping.php Auto-merging lib/ping.php CONFLICT (add/add): Merge conflict in lib/mib_cache.php Auto-merging lib/mib_cache.php CONFLICT (add/add): Merge conflict in lib/ldap.php Auto-merging lib/ldap.php CONFLICT (add/add): Merge conflict in lib/installer.php Auto-merging lib/installer.php CONFLICT (add/add): Merge conflict in lib/import.php Auto-merging lib/import.php CONFLICT (add/add): Merge conflict in lib/html_validate.php Auto-merging lib/html_validate.php CONFLICT (add/add): Merge conflict in lib/html_utility.php Auto-merging lib/html_utility.php CONFLICT (add/add): Merge conflict in lib/html_tree.php Auto-merging lib/html_tree.php CONFLICT (add/add): Merge conflict in lib/html_reports.php Auto-merging lib/html_reports.php CONFLICT (add/add): Merge conflict in lib/html_graph.php Auto-merging lib/html_graph.php CONFLICT (add/add): Merge conflict in lib/html_form_template.php Auto-merging lib/html_form_template.php CONFLICT (add/add): Merge conflict in lib/html_form.php Auto-merging lib/html_form.php CONFLICT (add/add): Merge conflict in lib/html_filter.php Auto-merging lib/html_filter.php CONFLICT (add/add): Merge conflict in lib/html.php Auto-merging lib/html.php CONFLICT (add/add): Merge conflict in lib/graphs.php Auto-merging lib/graphs.php CONFLICT (add/add): Merge conflict in lib/graph_variables.php Auto-merging lib/graph_variables.php CONFLICT (add/add): Merge conflict in lib/functions.php Auto-merging lib/functions.php CONFLICT (add/add): Merge conflict in lib/export.php Auto-merging lib/export.php CONFLICT (add/add): Merge conflict in lib/dsstats.php Auto-merging lib/dsstats.php CONFLICT (add/add): Merge conflict in lib/dsdebug.php Auto-merging lib/dsdebug.php CONFLICT (add/add): Merge conflict in lib/database.php Auto-merging lib/database.php CONFLICT (add/add): Merge conflict in lib/data_query.php Auto-merging lib/data_query.php CONFLICT (add/add): Merge conflict in lib/clog_webapi.php Auto-merging lib/clog_webapi.php CONFLICT (add/add): Merge conflict in lib/cdef.php Auto-merging lib/cdef.php CONFLICT (add/add): Merge conflict in lib/boost.php Auto-merging lib/boost.php CONFLICT (add/add): Merge conflict in lib/auth.php Auto-merging lib/auth.php CONFLICT (add/add): Merge conflict in lib/api_tree.php Auto-merging lib/api_tree.php CONFLICT (add/add): Merge conflict in lib/api_poller.php Auto-merging lib/api_poller.php CONFLICT (add/add): Merge conflict in lib/api_graph.php Auto-merging lib/api_graph.php CONFLICT (add/add): Merge conflict in lib/api_device.php Auto-merging lib/api_device.php CONFLICT (add/add): Merge conflict in lib/api_data_source.php Auto-merging lib/api_data_source.php CONFLICT (add/add): Merge conflict in lib/api_automation_tools.php Auto-merging lib/api_automation_tools.php CONFLICT (add/add): Merge conflict in lib/api_automation.php Auto-merging lib/api_automation.php CONFLICT (add/add): Merge conflict in lib/api_aggregate.php Auto-merging lib/api_aggregate.php CONFLICT (add/add): Merge conflict in lib/aggregate.php Auto-merging lib/aggregate.php CONFLICT (add/add): Merge conflict in install/upgrades/1_3_0.php Auto-merging install/upgrades/1_3_0.php CONFLICT (add/add): Merge conflict in install/upgrades/1_2_8.php Auto-merging install/upgrades/1_2_8.php CONFLICT (add/add): Merge conflict in install/upgrades/1_2_7.php Auto-merging install/upgrades/1_2_7.php CONFLICT (add/add): Merge conflict in install/upgrades/1_2_5.php Auto-merging install/upgrades/1_2_5.php CONFLICT (add/add): Merge conflict in install/upgrades/1_2_3.php Auto-merging install/upgrades/1_2_3.php CONFLICT (add/add): Merge conflict in install/upgrades/1_2_2.php Auto-merging install/upgrades/1_2_2.php CONFLICT (add/add): Merge conflict in install/upgrades/1_2_17.php Auto-merging install/upgrades/1_2_17.php CONFLICT (add/add): Merge conflict in install/upgrades/1_2_15.php Auto-merging install/upgrades/1_2_15.php CONFLICT (add/add): Merge conflict in install/upgrades/1_2_14.php Auto-merging install/upgrades/1_2_14.php CONFLICT (add/add): Merge conflict in install/upgrades/1_2_11.php Auto-merging install/upgrades/1_2_11.php CONFLICT (add/add): Merge conflict in install/upgrades/1_2_1.php Auto-merging install/upgrades/1_2_1.php CONFLICT (add/add): Merge conflict in install/upgrades/1_2_0.php Auto-merging install/upgrades/1_2_0.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_8.php Auto-merging install/upgrades/1_1_8.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_7.php Auto-merging install/upgrades/1_1_7.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_6.php Auto-merging install/upgrades/1_1_6.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_4.php Auto-merging install/upgrades/1_1_4.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_37.php Auto-merging install/upgrades/1_1_37.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_36.php Auto-merging install/upgrades/1_1_36.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_35.php Auto-merging install/upgrades/1_1_35.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_34.php Auto-merging install/upgrades/1_1_34.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_31.php Auto-merging install/upgrades/1_1_31.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_28.php Auto-merging install/upgrades/1_1_28.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_26.php Auto-merging install/upgrades/1_1_26.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_20.php Auto-merging install/upgrades/1_1_20.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_2.php Auto-merging install/upgrades/1_1_2.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_17.php Auto-merging install/upgrades/1_1_17.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_14.php Auto-merging install/upgrades/1_1_14.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_11.php Auto-merging install/upgrades/1_1_11.php CONFLICT (add/add): Merge conflict in install/upgrades/1_0_5.php Auto-merging install/upgrades/1_0_5.php CONFLICT (add/add): Merge conflict in install/upgrades/1_0_4.php Auto-merging install/upgrades/1_0_4.php CONFLICT (add/add): Merge conflict in install/upgrades/1_0_0.php Auto-merging install/upgrades/1_0_0.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_8.php Auto-merging install/upgrades/0_8_8.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_7h.php Auto-merging install/upgrades/0_8_7h.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_7c.php Auto-merging install/upgrades/0_8_7c.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_7b.php Auto-merging install/upgrades/0_8_7b.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_7a.php Auto-merging install/upgrades/0_8_7a.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_7.php Auto-merging install/upgrades/0_8_7.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_6i.php Auto-merging install/upgrades/0_8_6i.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_6h.php Auto-merging install/upgrades/0_8_6h.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_6g.php Auto-merging install/upgrades/0_8_6g.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_6e.php Auto-merging install/upgrades/0_8_6e.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_6d.php Auto-merging install/upgrades/0_8_6d.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_6a.php Auto-merging install/upgrades/0_8_6a.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_6.php Auto-merging install/upgrades/0_8_6.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_5.php Auto-merging install/upgrades/0_8_5.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_4.php Auto-merging install/upgrades/0_8_4.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_3.php Auto-merging install/upgrades/0_8_3.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_2a.php Auto-merging install/upgrades/0_8_2a.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_2.php Auto-merging install/upgrades/0_8_2.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_1.php Auto-merging install/upgrades/0_8_1.php CONFLICT (add/add): Merge conflict in install/templates/Windows_Device.xml.gz Auto-merging install/templates/Windows_Device.xml.gz CONFLICT (add/add): Merge conflict in install/templates/NetSNMP_Device.xml.gz Auto-merging install/templates/NetSNMP_Device.xml.gz CONFLICT (add/add): Merge conflict in install/templates/Local_Linux_Machine.xml.gz Auto-merging install/templates/Local_Linux_Machine.xml.gz CONFLICT (add/add): Merge conflict in install/templates/Generic_SNMP_Device.xml.gz Auto-merging install/templates/Generic_SNMP_Device.xml.gz CONFLICT (add/add): Merge conflict in install/templates/Cisco_Router.xml.gz Auto-merging install/templates/Cisco_Router.xml.gz CONFLICT (add/add): Merge conflict in install/templates/Cacti_Stats.xml.gz Auto-merging install/templates/Cacti_Stats.xml.gz CONFLICT (add/add): Merge conflict in install/step_json.php Auto-merging install/step_json.php CONFLICT (add/add): Merge conflict in install/install.php Auto-merging install/install.php CONFLICT (add/add): Merge conflict in install/install.js Auto-merging install/install.js CONFLICT (add/add): Merge conflict in install/install.css Auto-merging install/install.css CONFLICT (add/add): Merge conflict in install/index.php Auto-merging install/index.php CONFLICT (add/add): Merge conflict in install/functions.php Auto-merging install/functions.php CONFLICT (add/add): Merge conflict in install/cli_test.php Auto-merging install/cli_test.php CONFLICT (add/add): Merge conflict in install/cli_check.php Auto-merging install/cli_check.php CONFLICT (add/add): Merge conflict in install/background.php Auto-merging install/background.php CONFLICT (add/add): Merge conflict in index.php Auto-merging index.php CONFLICT (add/add): Merge conflict in include/vendor/phpsnmp/mib_parser.php Auto-merging include/vendor/phpsnmp/mib_parser.php CONFLICT (add/add): Merge conflict in include/vendor/phpsnmp/extension.php Auto-merging include/vendor/phpsnmp/extension.php CONFLICT (add/add): Merge conflict in include/vendor/phpsnmp/classSNMP.php Auto-merging include/vendor/phpsnmp/classSNMP.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/bootstrap.php Auto-merging include/vendor/phpseclib/bootstrap.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/System/SSH/Agent.php Auto-merging include/vendor/phpseclib/System/SSH/Agent.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/Net/SSH2.php Auto-merging include/vendor/phpseclib/Net/SSH2.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/Net/SFTP.php Auto-merging include/vendor/phpseclib/Net/SFTP.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/Math/BigInteger.php Auto-merging include/vendor/phpseclib/Math/BigInteger.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/File/X509.php Auto-merging include/vendor/phpseclib/File/X509.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/File/ASN1.php Auto-merging include/vendor/phpseclib/File/ASN1.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/Crypt/Twofish.php Auto-merging include/vendor/phpseclib/Crypt/Twofish.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/Crypt/Rijndael.php Auto-merging include/vendor/phpseclib/Crypt/Rijndael.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/Crypt/RSA.php Auto-merging include/vendor/phpseclib/Crypt/RSA.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/Crypt/RC2.php Auto-merging include/vendor/phpseclib/Crypt/RC2.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/Crypt/DES.php Auto-merging include/vendor/phpseclib/Crypt/DES.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/Crypt/Blowfish.php Auto-merging include/vendor/phpseclib/Crypt/Blowfish.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/Crypt/Base.php Auto-merging include/vendor/phpseclib/Crypt/Base.php CONFLICT (add/add): Merge conflict in include/vendor/gettext/tests/TranslatorTest.php Auto-merging include/vendor/gettext/tests/TranslatorTest.php CONFLICT (add/add): Merge conflict in include/vendor/gettext/src/translator_functions.php Auto-merging include/vendor/gettext/src/translator_functions.php CONFLICT (add/add): Merge conflict in include/vendor/gettext/CONTRIBUTING.md Auto-merging include/vendor/gettext/CONTRIBUTING.md CONFLICT (add/add): Merge conflict in include/vendor/csrf/csrf-conf.php Auto-merging include/vendor/csrf/csrf-conf.php CONFLICT (add/add): Merge conflict in include/vendor/cldr-to-gettext-plural-rules/bin/export-plural-rules Auto-merging include/vendor/cldr-to-gettext-plural-rules/bin/export-plural-rules CONFLICT (add/add): Merge conflict in include/vendor/GoogleAuthenticator/RuntimeException.php Auto-merging include/vendor/GoogleAuthenticator/RuntimeException.php CONFLICT (add/add): Merge conflict in include/vendor/GoogleAuthenticator/GoogleQrUrl.php Auto-merging include/vendor/GoogleAuthenticator/GoogleQrUrl.php CONFLICT (add/add): Merge conflict in include/vendor/GoogleAuthenticator/GoogleAuthenticatorInterface.php Auto-merging include/vendor/GoogleAuthenticator/GoogleAuthenticatorInterface.php CONFLICT (add/add): Merge conflict in include/vendor/GoogleAuthenticator/GoogleAuthenticator.php Auto-merging include/vendor/GoogleAuthenticator/GoogleAuthenticator.php CONFLICT (add/add): Merge conflict in include/vendor/GoogleAuthenticator/FixedBitNotation.php Auto-merging include/vendor/GoogleAuthenticator/FixedBitNotation.php CONFLICT (add/add): Merge conflict in include/top_header.php Auto-merging include/top_header.php CONFLICT (add/add): Merge conflict in include/top_graph_header.php Auto-merging include/top_graph_header.php CONFLICT (add/add): Merge conflict in include/top_general_header.php Auto-merging include/top_general_header.php CONFLICT (add/add): Merge conflict in include/themes/sunrise/main.js Auto-merging include/themes/sunrise/main.js CONFLICT (add/add): Merge conflict in include/themes/sunrise/main.css Auto-merging include/themes/sunrise/main.css CONFLICT (add/add): Merge conflict in include/themes/raspberry/main.js Auto-merging include/themes/raspberry/main.js CONFLICT (add/add): Merge conflict in include/themes/paw/main.js Auto-merging include/themes/paw/main.js CONFLICT (add/add): Merge conflict in include/themes/paw/main.css Auto-merging include/themes/paw/main.css CONFLICT (add/add): Merge conflict in include/themes/paw/jquery.timepicker.css Auto-merging include/themes/paw/jquery.timepicker.css CONFLICT (add/add): Merge conflict in include/themes/paper-plane/main.js Auto-merging include/themes/paper-plane/main.js CONFLICT (add/add): Merge conflict in include/themes/paper-plane/main.css Auto-merging include/themes/paper-plane/main.css CONFLICT (add/add): Merge conflict in include/themes/paper-plane/billboard.css Auto-merging include/themes/paper-plane/billboard.css CONFLICT (add/add): Merge conflict in include/themes/modern/main.js Auto-merging include/themes/modern/main.js CONFLICT (add/add): Merge conflict in include/themes/modern/main.css Auto-merging include/themes/modern/main.css CONFLICT (add/add): Merge conflict in include/themes/midwinter/rrdtheme.php Auto-merging include/themes/midwinter/rrdtheme.php CONFLICT (add/add): Merge conflict in include/themes/midwinter/pace.css Auto-merging include/themes/midwinter/pace.css CONFLICT (add/add): Merge conflict in include/themes/midwinter/main.js Auto-merging include/themes/midwinter/main.js CONFLICT (add/add): Merge conflict in include/themes/midwinter/main.css Auto-merging include/themes/midwinter/main.css CONFLICT (add/add): Merge conflict in include/themes/midwinter/jquery.zoom.css Auto-merging include/themes/midwinter/jquery.zoom.css CONFLICT (add/add): Merge conflict in include/themes/hollyberry/main.js Auto-merging include/themes/hollyberry/main.js CONFLICT (add/add): Merge conflict in include/themes/dark/main.js Auto-merging include/themes/dark/main.js CONFLICT (add/add): Merge conflict in include/themes/dark/main.css Auto-merging include/themes/dark/main.css CONFLICT (add/add): Merge conflict in include/themes/classic/main.css Auto-merging include/themes/classic/main.css CONFLICT (add/add): Merge conflict in include/themes/carrot/main.js Auto-merging include/themes/carrot/main.js CONFLICT (add/add): Merge conflict in include/themes/cacti/main.js Auto-merging include/themes/cacti/main.js CONFLICT (add/add): Merge conflict in include/session.php Auto-merging include/session.php CONFLICT (add/add): Merge conflict in include/realtime.js Auto-merging include/realtime.js CONFLICT (add/add): Merge conflict in include/plugins.php Auto-merging include/plugins.php CONFLICT (add/add): Merge conflict in include/layout.js Auto-merging include/layout.js CONFLICT (add/add): Merge conflict in include/js/pace.js Auto-merging include/js/pace.js CONFLICT (add/add): Merge conflict in include/js/jstree.js Auto-merging include/js/jstree.js CONFLICT (add/add): Merge conflict in include/js/jquery.zoom.js Auto-merging include/js/jquery.zoom.js CONFLICT (add/add): Merge conflict in include/js/jquery.multiselect.js Auto-merging include/js/jquery.multiselect.js CONFLICT (add/add): Merge conflict in include/js/jquery.js Auto-merging include/js/jquery.js CONFLICT (add/add): Merge conflict in include/js/jquery.dropdown.js Auto-merging include/js/jquery.dropdown.js CONFLICT (add/add): Merge conflict in include/js/jquery-ui.js Auto-merging include/js/jquery-ui.js CONFLICT (add/add): Merge conflict in include/js/billboard.js Auto-merging include/js/billboard.js CONFLICT (add/add): Merge conflict in include/global_settings.php Auto-merging include/global_settings.php CONFLICT (add/add): Merge conflict in include/global_session.php Auto-merging include/global_session.php CONFLICT (add/add): Merge conflict in include/global_languages.php Auto-merging include/global_languages.php CONFLICT (add/add): Merge conflict in include/global_form.php Auto-merging include/global_form.php CONFLICT (add/add): Merge conflict in include/global_constants.php Auto-merging include/global_constants.php CONFLICT (add/add): Merge conflict in include/global_arrays.php Auto-merging include/global_arrays.php CONFLICT (add/add): Merge conflict in include/global.php Auto-merging include/global.php CONFLICT (add/add): Merge conflict in include/fa/css/all.css Auto-merging include/fa/css/all.css CONFLICT (add/add): Merge conflict in include/csrf.php Auto-merging include/csrf.php CONFLICT (add/add): Merge conflict in include/config.php.dist Auto-merging include/config.php.dist CONFLICT (add/add): Merge conflict in include/cli_check.php Auto-merging include/cli_check.php CONFLICT (add/add): Merge conflict in include/bottom_footer.php Auto-merging include/bottom_footer.php CONFLICT (add/add): Merge conflict in include/auth.php Auto-merging include/auth.php CONFLICT (add/add): Merge conflict in images/cacti_logo_new.gif Auto-merging images/cacti_logo_new.gif CONFLICT (add/add): Merge conflict in images/cacti_logo.gif Auto-merging images/cacti_logo.gif CONFLICT (add/add): Merge conflict in host_templates.php Auto-merging host_templates.php CONFLICT (add/add): Merge conflict in host.php Auto-merging host.php CONFLICT (add/add): Merge conflict in graphs_new.php Auto-merging graphs_new.php CONFLICT (add/add): Merge conflict in graphs_items.php Auto-merging graphs_items.php CONFLICT (add/add): Merge conflict in graphs.php Auto-merging graphs.php CONFLICT (add/add): Merge conflict in graph_xport.php Auto-merging graph_xport.php CONFLICT (add/add): Merge conflict in graph_view.php Auto-merging graph_view.php CONFLICT (add/add): Merge conflict in graph_templates_items.php Auto-merging graph_templates_items.php CONFLICT (add/add): Merge conflict in graph_templates_inputs.php Auto-merging graph_templates_inputs.php CONFLICT (add/add): Merge conflict in graph_templates.php Auto-merging graph_templates.php CONFLICT (add/add): Merge conflict in graph_realtime.php Auto-merging graph_realtime.php CONFLICT (add/add): Merge conflict in graph_json.php Auto-merging graph_json.php CONFLICT (add/add): Merge conflict in graph_image.php Auto-merging graph_image.php CONFLICT (add/add): Merge conflict in graph.php Auto-merging graph.php CONFLICT (add/add): Merge conflict in gprint_presets.php Auto-merging gprint_presets.php CONFLICT (add/add): Merge conflict in formats/cacti_monitor.format Auto-merging formats/cacti_monitor.format CONFLICT (add/add): Merge conflict in formats/cacti_group_dark.format Auto-merging formats/cacti_group_dark.format CONFLICT (add/add): Merge conflict in formats/cacti_group.format Auto-merging formats/cacti_group.format CONFLICT (add/add): Merge conflict in docs/index.php Auto-merging docs/index.php CONFLICT (add/add): Merge conflict in docs/audit_schema.sql Auto-merging docs/audit_schema.sql CONFLICT (add/add): Merge conflict in docs/README.md Auto-merging docs/README.md CONFLICT (add/add): Merge conflict in data_templates.php Auto-merging data_templates.php CONFLICT (add/add): Merge conflict in data_sources.php Auto-merging data_sources.php CONFLICT (add/add): Merge conflict in data_source_profiles.php Auto-merging data_source_profiles.php CONFLICT (add/add): Merge conflict in data_queries.php Auto-merging data_queries.php CONFLICT (add/add): Merge conflict in data_input.php Auto-merging data_input.php CONFLICT (add/add): Merge conflict in data_debug.php Auto-merging data_debug.php CONFLICT (add/add): Merge conflict in color_templates_items.php Auto-merging color_templates_items.php CONFLICT (add/add): Merge conflict in color_templates.php Auto-merging color_templates.php CONFLICT (add/add): Merge conflict in color.php Auto-merging color.php CONFLICT (add/add): Merge conflict in cmd_realtime.php Auto-merging cmd_realtime.php CONFLICT (add/add): Merge conflict in cmd.php Auto-merging cmd.php CONFLICT (add/add): Merge conflict in clog_user.php Auto-merging clog_user.php CONFLICT (add/add): Merge conflict in clog.php Auto-merging clog.php CONFLICT (add/add): Merge conflict in cli/version.php Auto-merging cli/version.php CONFLICT (add/add): Merge conflict in cli/upgrade_database.php Auto-merging cli/upgrade_database.php CONFLICT (add/add): Merge conflict in cli/structure_rra_paths.php Auto-merging cli/structure_rra_paths.php CONFLICT (add/add): Merge conflict in cli/sqltable_to_php.php Auto-merging cli/sqltable_to_php.php CONFLICT (add/add): Merge conflict in cli/splice_rrd.php Auto-merging cli/splice_rrd.php CONFLICT (add/add): Merge conflict in cli/show_perms.php Auto-merging cli/show_perms.php CONFLICT (add/add): Merge conflict in cli/rrdresize.php Auto-merging cli/rrdresize.php CONFLICT (add/add): Merge conflict in cli/repair_templates.php Auto-merging cli/repair_templates.php CONFLICT (add/add): Merge conflict in cli/repair_graphs.php Auto-merging cli/repair_graphs.php CONFLICT (add/add): Merge conflict in cli/repair_database.php Auto-merging cli/repair_database.php CONFLICT (add/add): Merge conflict in cli/reorder_data_query.php Auto-merging cli/reorder_data_query.php CONFLICT (add/add): Merge conflict in cli/removespikes.php Auto-merging cli/removespikes.php CONFLICT (add/add): Merge conflict in cli/remove_graphs.php Auto-merging cli/remove_graphs.php CONFLICT (add/add): Merge conflict in cli/remove_device.php Auto-merging cli/remove_device.php CONFLICT (add/add): Merge conflict in cli/refresh_csrf.php Auto-merging cli/refresh_csrf.php CONFLICT (add/add): Merge conflict in cli/rebuild_poller_cache.php Auto-merging cli/rebuild_poller_cache.php CONFLICT (add/add): Merge conflict in cli/poller_replicate.php Auto-merging cli/poller_replicate.php CONFLICT (add/add): Merge conflict in cli/poller_reindex_hosts.php Auto-merging cli/poller_reindex_hosts.php CONFLICT (add/add): Merge conflict in cli/poller_output_empty.php Auto-merging cli/poller_output_empty.php CONFLICT (add/add): Merge conflict in cli/poller_graphs_reapply_names.php Auto-merging cli/poller_graphs_reapply_names.php CONFLICT (add/add): Merge conflict in cli/poller_data_sources_reapply_names.php Auto-merging cli/poller_data_sources_reapply_names.php CONFLICT (add/add): Merge conflict in cli/md5sum.php Auto-merging cli/md5sum.php CONFLICT (add/add): Merge conflict in cli/install_cacti.php Auto-merging cli/install_cacti.php CONFLICT (add/add): Merge conflict in cli/input_whitelist.php Auto-merging cli/input_whitelist.php CONFLICT (add/add): Merge conflict in cli/import_template.php Auto-merging cli/import_template.php CONFLICT (add/add): Merge conflict in cli/import_package.php Auto-merging cli/import_package.php CONFLICT (add/add): Merge conflict in cli/host_update_template.php Auto-merging cli/host_update_template.php CONFLICT (add/add): Merge conflict in cli/fix_mediumint.php Auto-merging cli/fix_mediumint.php CONFLICT (add/add): Merge conflict in cli/copy_user.php Auto-merging cli/copy_user.php CONFLICT (add/add): Merge conflict in cli/convert_tables.php Auto-merging cli/convert_tables.php CONFLICT (add/add): Merge conflict in cli/change_device.php Auto-merging cli/change_device.php CONFLICT (add/add): Merge conflict in cli/audit_database.php Auto-merging cli/audit_database.php CONFLICT (add/add): Merge conflict in cli/apply_automation_rules.php Auto-merging cli/apply_automation_rules.php CONFLICT (add/add): Merge conflict in cli/analyze_database.php Auto-merging cli/analyze_database.php CONFLICT (add/add): Merge conflict in cli/add_tree.php Auto-merging cli/add_tree.php CONFLICT (add/add): Merge conflict in cli/add_site.php Auto-merging cli/add_site.php CONFLICT (add/add): Merge conflict in cli/add_perms.php Auto-merging cli/add_perms.php CONFLICT (add/add): Merge conflict in cli/add_graphs.php Auto-merging cli/add_graphs.php CONFLICT (add/add): Merge conflict in cli/add_graph_template.php Auto-merging cli/add_graph_template.php CONFLICT (add/add): Merge conflict in cli/add_device.php Auto-merging cli/add_device.php CONFLICT (add/add): Merge conflict in cli/add_datasource.php Auto-merging cli/add_datasource.php CONFLICT (add/add): Merge conflict in cli/add_data_query.php Auto-merging cli/add_data_query.php CONFLICT (add/add): Merge conflict in changelog.php Auto-merging changelog.php CONFLICT (add/add): Merge conflict in cdef.php Auto-merging cdef.php CONFLICT (add/add): Merge conflict in cactid.php Auto-merging cactid.php CONFLICT (add/add): Merge conflict in cacti.sql Auto-merging cacti.sql CONFLICT (add/add): Merge conflict in boost_rrdupdate.php Auto-merging boost_rrdupdate.php CONFLICT (add/add): Merge conflict in automation_tree_rules.php Auto-merging automation_tree_rules.php CONFLICT (add/add): Merge conflict in automation_templates.php Auto-merging automation_templates.php CONFLICT (add/add): Merge conflict in automation_snmp.php Auto-merging automation_snmp.php CONFLICT (add/add): Merge conflict in automation_networks.php Auto-merging automation_networks.php CONFLICT (add/add): Merge conflict in automation_graph_rules.php Auto-merging automation_graph_rules.php CONFLICT (add/add): Merge conflict in automation_devices.php Auto-merging automation_devices.php CONFLICT (add/add): Merge conflict in auth_profile.php Auto-merging auth_profile.php CONFLICT (add/add): Merge conflict in auth_login.php Auto-merging auth_login.php CONFLICT (add/add): Merge conflict in auth_changepassword.php Auto-merging auth_changepassword.php CONFLICT (add/add): Merge conflict in auth_2fa.php Auto-merging auth_2fa.php CONFLICT (add/add): Merge conflict in aggregate_templates.php Auto-merging aggregate_templates.php CONFLICT (add/add): Merge conflict in aggregate_items.php Auto-merging aggregate_items.php CONFLICT (add/add): Merge conflict in aggregate_graphs.php Auto-merging aggregate_graphs.php CONFLICT (add/add): Merge conflict in about.php Auto-merging about.php CONFLICT (add/add): Merge conflict in README.md Auto-merging README.md CONFLICT (add/add): Merge conflict in LICENSE Auto-merging LICENSE CONFLICT (add/add): Merge conflict in CHANGELOG Auto-merging CHANGELOG CONFLICT (add/add): Merge conflict in .travis.yml Auto-merging .travis.yml CONFLICT (add/add): Merge conflict in .gitignore Auto-merging .gitignore error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 Correct header shebang Resolve all conflicts manually, mark them as resolved with "git add/rm <conflicted_files>", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort". (1)a year ago
First, rewinding head to replay your work on top of it... Applying: Correct header shebang .git/rebase-apply/patch:4106: trailing whitespace. With that said, there are several changes that you MUST perform to MySQL/MariaDB .git/rebase-apply/patch:4160: trailing whitespace. do .git/rebase-apply/patch:4269: trailing whitespace. ### Check out the Cacti Group's Official YouTube channel .git/rebase-apply/patch:4425: trailing whitespace. If a vulnerability is reproducible with evidence, please .git/rebase-apply/patch:4426: trailing whitespace. contact us on [email protected]. We would appreciate warning: squelched 2355 whitespace errors warning: 2360 lines add whitespace errors. Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from Output of 'msggrep' might be incorrect. input file charset "UTF-8". Possible workarounds are: Output of 'msggrep' might be incorrect. - Set LC_ALL to a locale with encoding UTF-8. Possible workarounds are: - Convert the translation catalog to ASCII using 'msgconv', - Set LC_ALL to a locale with encoding UTF-8. then apply 'msggrep', - Convert the translation catalog to ASCII using 'msgconv', then convert back to UTF-8 using 'msgconv'. then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. warning: Cannot merge binary files: locales/LC_MESSAGES/zh-TW.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/zh-CN.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/vi-VN.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/tr-TR.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/sv-SE.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/ru-RU.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/pt-PT.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/pt-BR.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/pl-PL.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/nl-NL.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/ko-KR.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/ja-JP.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/it-IT.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/hi-IN.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/he-IL.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/fr-FR.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/es-ES.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/el-GR.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/de-DE.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/bg-BG.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/ar-SA.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: install/templates/Windows_Device.xml.gz (HEAD vs. Correct header shebang) warning: Cannot merge binary files: install/templates/NetSNMP_Device.xml.gz (HEAD vs. Correct header shebang) warning: Cannot merge binary files: install/templates/Local_Linux_Machine.xml.gz (HEAD vs. Correct header shebang) warning: Cannot merge binary files: install/templates/Generic_SNMP_Device.xml.gz (HEAD vs. Correct header shebang) warning: Cannot merge binary files: install/templates/Cisco_Router.xml.gz (HEAD vs. Correct header shebang) warning: Cannot merge binary files: install/templates/Cacti_Stats.xml.gz (HEAD vs. Correct header shebang) warning: Cannot merge binary files: images/cacti_logo_new.gif (HEAD vs. Correct header shebang) warning: Cannot merge binary files: images/cacti_logo.gif (HEAD vs. Correct header shebang) CONFLICT (add/add): Merge conflict in vdef.php Auto-merging vdef.php CONFLICT (add/add): Merge conflict in utilities.php Auto-merging utilities.php CONFLICT (add/add): Merge conflict in user_group_admin.php Auto-merging user_group_admin.php CONFLICT (add/add): Merge conflict in user_domains.php Auto-merging user_domains.php CONFLICT (add/add): Merge conflict in user_admin.php Auto-merging user_admin.php CONFLICT (add/add): Merge conflict in tree.php Auto-merging tree.php CONFLICT (add/add): Merge conflict in tests/tools/check_install_code.php Auto-merging tests/tools/check_install_code.php CONFLICT (add/add): Merge conflict in tests/tools/check_cli_version.sh Auto-merging tests/tools/check_cli_version.sh CONFLICT (add/add): Merge conflict in tests/tools/check_all_pages.sh Auto-merging tests/tools/check_all_pages.sh CONFLICT (add/add): Merge conflict in tests/tools/cacti.conf Auto-merging tests/tools/cacti.conf CONFLICT (add/add): Merge conflict in templates_import.php Auto-merging templates_import.php CONFLICT (add/add): Merge conflict in templates_export.php Auto-merging templates_export.php CONFLICT (add/add): Merge conflict in support.php Auto-merging support.php CONFLICT (add/add): Merge conflict in spikekill.php Auto-merging spikekill.php CONFLICT (add/add): Merge conflict in snmpagent_persist.php Auto-merging snmpagent_persist.php CONFLICT (add/add): Merge conflict in snmpagent_mibcachechild.php Auto-merging snmpagent_mibcachechild.php CONFLICT (add/add): Merge conflict in snmpagent_mibcache.php Auto-merging snmpagent_mibcache.php CONFLICT (add/add): Merge conflict in sites.php Auto-merging sites.php CONFLICT (add/add): Merge conflict in settings.php Auto-merging settings.php CONFLICT (add/add): Merge conflict in service/README.md Auto-merging service/README.md CONFLICT (add/add): Merge conflict in scripts/weatherbug.pl Auto-merging scripts/weatherbug.pl CONFLICT (add/add): Merge conflict in scripts/ss_webseer.php Auto-merging scripts/ss_webseer.php CONFLICT (add/add): Merge conflict in scripts/ss_sql.php Auto-merging scripts/ss_sql.php CONFLICT (add/add): Merge conflict in scripts/ss_poller.php Auto-merging scripts/ss_poller.php CONFLICT (add/add): Merge conflict in scripts/ss_net_snmp_disk_io.php Auto-merging scripts/ss_net_snmp_disk_io.php CONFLICT (add/add): Merge conflict in scripts/ss_net_snmp_disk_bytes.php Auto-merging scripts/ss_net_snmp_disk_bytes.php CONFLICT (add/add): Merge conflict in scripts/ss_hstats.php Auto-merging scripts/ss_hstats.php CONFLICT (add/add): Merge conflict in scripts/ss_host_disk.php Auto-merging scripts/ss_host_disk.php CONFLICT (add/add): Merge conflict in scripts/ss_host_cpu.php Auto-merging scripts/ss_host_cpu.php CONFLICT (add/add): Merge conflict in scripts/ss_gexport.php Auto-merging scripts/ss_gexport.php CONFLICT (add/add): Merge conflict in scripts/ss_fping.php Auto-merging scripts/ss_fping.php CONFLICT (add/add): Merge conflict in scripts/ss_cpoller.php Auto-merging scripts/ss_cpoller.php CONFLICT (add/add): Merge conflict in scripts/ss_count_oids.php Auto-merging scripts/ss_count_oids.php CONFLICT (add/add): Merge conflict in scripts/cacti_user_stats.php Auto-merging scripts/cacti_user_stats.php CONFLICT (add/add): Merge conflict in script_server.php Auto-merging script_server.php CONFLICT (add/add): Merge conflict in rrdcleaner.php Auto-merging rrdcleaner.php CONFLICT (add/add): Merge conflict in resource/snmp_queries/interface.xml Auto-merging resource/snmp_queries/interface.xml CONFLICT (add/add): Merge conflict in resource/script_server/webseer.xml Auto-merging resource/script_server/webseer.xml CONFLICT (add/add): Merge conflict in resource/script_server/host_disk.xml Auto-merging resource/script_server/host_disk.xml CONFLICT (add/add): Merge conflict in resource/script_server/host_cpu.xml Auto-merging resource/script_server/host_cpu.xml CONFLICT (add/add): Merge conflict in resource/script_server/gexport.xml Auto-merging resource/script_server/gexport.xml CONFLICT (add/add): Merge conflict in resource/script_server/cpoller.xml Auto-merging resource/script_server/cpoller.xml CONFLICT (add/add): Merge conflict in resource/script_queries/unix_disk.xml Auto-merging resource/script_queries/unix_disk.xml CONFLICT (add/add): Merge conflict in resource/script_queries/host_disk.xml Auto-merging resource/script_queries/host_disk.xml CONFLICT (add/add): Merge conflict in resource/script_queries/host_cpu.xml Auto-merging resource/script_queries/host_cpu.xml CONFLICT (add/add): Merge conflict in reports_user.php Auto-merging reports_user.php CONFLICT (add/add): Merge conflict in reports_admin.php Auto-merging reports_admin.php CONFLICT (add/add): Merge conflict in remote_agent.php Auto-merging remote_agent.php CONFLICT (add/add): Merge conflict in pollers.php Auto-merging pollers.php CONFLICT (add/add): Merge conflict in poller_spikekill.php Auto-merging poller_spikekill.php CONFLICT (add/add): Merge conflict in poller_reports.php Auto-merging poller_reports.php CONFLICT (add/add): Merge conflict in poller_recovery.php Auto-merging poller_recovery.php CONFLICT (add/add): Merge conflict in poller_realtime.php Auto-merging poller_realtime.php CONFLICT (add/add): Merge conflict in poller_maintenance.php Auto-merging poller_maintenance.php CONFLICT (add/add): Merge conflict in poller_dsstats.php Auto-merging poller_dsstats.php CONFLICT (add/add): Merge conflict in poller_commands.php Auto-merging poller_commands.php CONFLICT (add/add): Merge conflict in poller_boost.php Auto-merging poller_boost.php CONFLICT (add/add): Merge conflict in poller_automation.php Auto-merging poller_automation.php CONFLICT (add/add): Merge conflict in poller.php Auto-merging poller.php CONFLICT (add/add): Merge conflict in plugins.php Auto-merging plugins.php CONFLICT (add/add): Merge conflict in permission_denied.php Auto-merging permission_denied.php CONFLICT (add/add): Merge conflict in mibs/CACTI-SNMPAGENT-MIB Auto-merging mibs/CACTI-SNMPAGENT-MIB CONFLICT (add/add): Merge conflict in mibs/CACTI-MIB Auto-merging mibs/CACTI-MIB CONFLICT (add/add): Merge conflict in mibs/CACTI-BOOST-MIB Auto-merging mibs/CACTI-BOOST-MIB CONFLICT (add/add): Merge conflict in managers.php Auto-merging managers.php CONFLICT (add/add): Merge conflict in logout.php Auto-merging logout.php CONFLICT (add/add): Merge conflict in locales/po/zh-TW.po Auto-merging locales/po/zh-TW.po CONFLICT (add/add): Merge conflict in locales/po/zh-CN.po Auto-merging locales/po/zh-CN.po CONFLICT (add/add): Merge conflict in locales/po/vi-VN.po Auto-merging locales/po/vi-VN.po CONFLICT (add/add): Merge conflict in locales/po/tr-TR.po Auto-merging locales/po/tr-TR.po CONFLICT (add/add): Merge conflict in locales/po/sv-SE.po Auto-merging locales/po/sv-SE.po CONFLICT (add/add): Merge conflict in locales/po/ru-RU.po Auto-merging locales/po/ru-RU.po CONFLICT (add/add): Merge conflict in locales/po/pt-PT.po Auto-merging locales/po/pt-PT.po CONFLICT (add/add): Merge conflict in locales/po/pt-BR.po Auto-merging locales/po/pt-BR.po CONFLICT (add/add): Merge conflict in locales/po/pl-PL.po Auto-merging locales/po/pl-PL.po CONFLICT (add/add): Merge conflict in locales/po/nl-NL.po Auto-merging locales/po/nl-NL.po CONFLICT (add/add): Merge conflict in locales/po/ko-KR.po Auto-merging locales/po/ko-KR.po CONFLICT (add/add): Merge conflict in locales/po/ja-JP.po Auto-merging locales/po/ja-JP.po CONFLICT (add/add): Merge conflict in locales/po/it-IT.po Auto-merging locales/po/it-IT.po CONFLICT (add/add): Merge conflict in locales/po/hi-IN.po Auto-merging locales/po/hi-IN.po CONFLICT (add/add): Merge conflict in locales/po/he-IL.po Auto-merging locales/po/he-IL.po CONFLICT (add/add): Merge conflict in locales/po/fr-FR.po Auto-merging locales/po/fr-FR.po CONFLICT (add/add): Merge conflict in locales/po/es-ES.po Auto-merging locales/po/es-ES.po CONFLICT (add/add): Merge conflict in locales/po/el-GR.po Auto-merging locales/po/el-GR.po CONFLICT (add/add): Merge conflict in locales/po/de-DE.po Auto-merging locales/po/de-DE.po CONFLICT (add/add): Merge conflict in locales/po/cacti.pot Auto-merging locales/po/cacti.pot CONFLICT (add/add): Merge conflict in locales/po/bg-BG.po Auto-merging locales/po/bg-BG.po CONFLICT (add/add): Merge conflict in locales/po/ar-SA.po Auto-merging locales/po/ar-SA.po CONFLICT (add/add): Merge conflict in locales/build_gettext.sh Auto-merging locales/build_gettext.sh CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/zh-TW.mo Auto-merging locales/LC_MESSAGES/zh-TW.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/zh-CN.mo Auto-merging locales/LC_MESSAGES/zh-CN.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/vi-VN.mo Auto-merging locales/LC_MESSAGES/vi-VN.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/tr-TR.mo Auto-merging locales/LC_MESSAGES/tr-TR.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/sv-SE.mo Auto-merging locales/LC_MESSAGES/sv-SE.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/ru-RU.mo Auto-merging locales/LC_MESSAGES/ru-RU.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/pt-PT.mo Auto-merging locales/LC_MESSAGES/pt-PT.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/pt-BR.mo Auto-merging locales/LC_MESSAGES/pt-BR.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/pl-PL.mo Auto-merging locales/LC_MESSAGES/pl-PL.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/nl-NL.mo Auto-merging locales/LC_MESSAGES/nl-NL.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/ko-KR.mo Auto-merging locales/LC_MESSAGES/ko-KR.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/ja-JP.mo Auto-merging locales/LC_MESSAGES/ja-JP.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/it-IT.mo Auto-merging locales/LC_MESSAGES/it-IT.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/hi-IN.mo Auto-merging locales/LC_MESSAGES/hi-IN.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/he-IL.mo Auto-merging locales/LC_MESSAGES/he-IL.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/fr-FR.mo Auto-merging locales/LC_MESSAGES/fr-FR.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/es-ES.mo Auto-merging locales/LC_MESSAGES/es-ES.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/el-GR.mo Auto-merging locales/LC_MESSAGES/el-GR.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/de-DE.mo Auto-merging locales/LC_MESSAGES/de-DE.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/bg-BG.mo Auto-merging locales/LC_MESSAGES/bg-BG.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/ar-SA.mo Auto-merging locales/LC_MESSAGES/ar-SA.mo CONFLICT (add/add): Merge conflict in links.php Auto-merging links.php CONFLICT (add/add): Merge conflict in link.php Auto-merging link.php CONFLICT (add/add): Merge conflict in lib/xml.php Auto-merging lib/xml.php CONFLICT (add/add): Merge conflict in lib/vdef.php Auto-merging lib/vdef.php CONFLICT (add/add): Merge conflict in lib/variables.php Auto-merging lib/variables.php CONFLICT (add/add): Merge conflict in lib/utility.php Auto-merging lib/utility.php CONFLICT (add/add): Merge conflict in lib/timespan_settings.php Auto-merging lib/timespan_settings.php CONFLICT (add/add): Merge conflict in lib/time.php Auto-merging lib/time.php CONFLICT (add/add): Merge conflict in lib/template.php Auto-merging lib/template.php CONFLICT (add/add): Merge conflict in lib/spikekill.php Auto-merging lib/spikekill.php CONFLICT (add/add): Merge conflict in lib/sort.php Auto-merging lib/sort.php CONFLICT (add/add): Merge conflict in lib/snmpagent.php Auto-merging lib/snmpagent.php CONFLICT (add/add): Merge conflict in lib/snmp.php Auto-merging lib/snmp.php CONFLICT (add/add): Merge conflict in lib/rrd.php Auto-merging lib/rrd.php CONFLICT (add/add): Merge conflict in lib/reports.php Auto-merging lib/reports.php CONFLICT (add/add): Merge conflict in lib/poller.php Auto-merging lib/poller.php CONFLICT (add/add): Merge conflict in lib/plugins.php Auto-merging lib/plugins.php CONFLICT (add/add): Merge conflict in lib/ping.php Auto-merging lib/ping.php CONFLICT (add/add): Merge conflict in lib/mib_cache.php Auto-merging lib/mib_cache.php CONFLICT (add/add): Merge conflict in lib/ldap.php Auto-merging lib/ldap.php CONFLICT (add/add): Merge conflict in lib/installer.php Auto-merging lib/installer.php CONFLICT (add/add): Merge conflict in lib/import.php Auto-merging lib/import.php CONFLICT (add/add): Merge conflict in lib/html_validate.php Auto-merging lib/html_validate.php CONFLICT (add/add): Merge conflict in lib/html_utility.php Auto-merging lib/html_utility.php CONFLICT (add/add): Merge conflict in lib/html_tree.php Auto-merging lib/html_tree.php CONFLICT (add/add): Merge conflict in lib/html_reports.php Auto-merging lib/html_reports.php CONFLICT (add/add): Merge conflict in lib/html_graph.php Auto-merging lib/html_graph.php CONFLICT (add/add): Merge conflict in lib/html_form_template.php Auto-merging lib/html_form_template.php CONFLICT (add/add): Merge conflict in lib/html_form.php Auto-merging lib/html_form.php CONFLICT (add/add): Merge conflict in lib/html_filter.php Auto-merging lib/html_filter.php CONFLICT (add/add): Merge conflict in lib/html.php Auto-merging lib/html.php CONFLICT (add/add): Merge conflict in lib/graphs.php Auto-merging lib/graphs.php CONFLICT (add/add): Merge conflict in lib/graph_variables.php Auto-merging lib/graph_variables.php CONFLICT (add/add): Merge conflict in lib/functions.php Auto-merging lib/functions.php CONFLICT (add/add): Merge conflict in lib/export.php Auto-merging lib/export.php CONFLICT (add/add): Merge conflict in lib/dsstats.php Auto-merging lib/dsstats.php CONFLICT (add/add): Merge conflict in lib/dsdebug.php Auto-merging lib/dsdebug.php CONFLICT (add/add): Merge conflict in lib/database.php Auto-merging lib/database.php CONFLICT (add/add): Merge conflict in lib/data_query.php Auto-merging lib/data_query.php CONFLICT (add/add): Merge conflict in lib/clog_webapi.php Auto-merging lib/clog_webapi.php CONFLICT (add/add): Merge conflict in lib/cdef.php Auto-merging lib/cdef.php CONFLICT (add/add): Merge conflict in lib/boost.php Auto-merging lib/boost.php CONFLICT (add/add): Merge conflict in lib/auth.php Auto-merging lib/auth.php CONFLICT (add/add): Merge conflict in lib/api_tree.php Auto-merging lib/api_tree.php CONFLICT (add/add): Merge conflict in lib/api_poller.php Auto-merging lib/api_poller.php CONFLICT (add/add): Merge conflict in lib/api_graph.php Auto-merging lib/api_graph.php CONFLICT (add/add): Merge conflict in lib/api_device.php Auto-merging lib/api_device.php CONFLICT (add/add): Merge conflict in lib/api_data_source.php Auto-merging lib/api_data_source.php CONFLICT (add/add): Merge conflict in lib/api_automation_tools.php Auto-merging lib/api_automation_tools.php CONFLICT (add/add): Merge conflict in lib/api_automation.php Auto-merging lib/api_automation.php CONFLICT (add/add): Merge conflict in lib/api_aggregate.php Auto-merging lib/api_aggregate.php CONFLICT (add/add): Merge conflict in lib/aggregate.php Auto-merging lib/aggregate.php CONFLICT (add/add): Merge conflict in install/upgrades/1_3_0.php Auto-merging install/upgrades/1_3_0.php CONFLICT (add/add): Merge conflict in install/upgrades/1_2_8.php Auto-merging install/upgrades/1_2_8.php CONFLICT (add/add): Merge conflict in install/upgrades/1_2_7.php Auto-merging install/upgrades/1_2_7.php CONFLICT (add/add): Merge conflict in install/upgrades/1_2_5.php Auto-merging install/upgrades/1_2_5.php CONFLICT (add/add): Merge conflict in install/upgrades/1_2_3.php Auto-merging install/upgrades/1_2_3.php CONFLICT (add/add): Merge conflict in install/upgrades/1_2_2.php Auto-merging install/upgrades/1_2_2.php CONFLICT (add/add): Merge conflict in install/upgrades/1_2_17.php Auto-merging install/upgrades/1_2_17.php CONFLICT (add/add): Merge conflict in install/upgrades/1_2_15.php Auto-merging install/upgrades/1_2_15.php CONFLICT (add/add): Merge conflict in install/upgrades/1_2_14.php Auto-merging install/upgrades/1_2_14.php CONFLICT (add/add): Merge conflict in install/upgrades/1_2_11.php Auto-merging install/upgrades/1_2_11.php CONFLICT (add/add): Merge conflict in install/upgrades/1_2_1.php Auto-merging install/upgrades/1_2_1.php CONFLICT (add/add): Merge conflict in install/upgrades/1_2_0.php Auto-merging install/upgrades/1_2_0.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_8.php Auto-merging install/upgrades/1_1_8.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_7.php Auto-merging install/upgrades/1_1_7.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_6.php Auto-merging install/upgrades/1_1_6.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_4.php Auto-merging install/upgrades/1_1_4.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_37.php Auto-merging install/upgrades/1_1_37.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_36.php Auto-merging install/upgrades/1_1_36.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_35.php Auto-merging install/upgrades/1_1_35.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_34.php Auto-merging install/upgrades/1_1_34.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_31.php Auto-merging install/upgrades/1_1_31.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_28.php Auto-merging install/upgrades/1_1_28.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_26.php Auto-merging install/upgrades/1_1_26.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_20.php Auto-merging install/upgrades/1_1_20.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_2.php Auto-merging install/upgrades/1_1_2.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_17.php Auto-merging install/upgrades/1_1_17.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_14.php Auto-merging install/upgrades/1_1_14.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_11.php Auto-merging install/upgrades/1_1_11.php CONFLICT (add/add): Merge conflict in install/upgrades/1_0_5.php Auto-merging install/upgrades/1_0_5.php CONFLICT (add/add): Merge conflict in install/upgrades/1_0_4.php Auto-merging install/upgrades/1_0_4.php CONFLICT (add/add): Merge conflict in install/upgrades/1_0_0.php Auto-merging install/upgrades/1_0_0.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_8.php Auto-merging install/upgrades/0_8_8.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_7h.php Auto-merging install/upgrades/0_8_7h.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_7c.php Auto-merging install/upgrades/0_8_7c.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_7b.php Auto-merging install/upgrades/0_8_7b.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_7a.php Auto-merging install/upgrades/0_8_7a.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_7.php Auto-merging install/upgrades/0_8_7.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_6i.php Auto-merging install/upgrades/0_8_6i.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_6h.php Auto-merging install/upgrades/0_8_6h.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_6g.php Auto-merging install/upgrades/0_8_6g.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_6e.php Auto-merging install/upgrades/0_8_6e.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_6d.php Auto-merging install/upgrades/0_8_6d.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_6a.php Auto-merging install/upgrades/0_8_6a.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_6.php Auto-merging install/upgrades/0_8_6.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_5.php Auto-merging install/upgrades/0_8_5.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_4.php Auto-merging install/upgrades/0_8_4.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_3.php Auto-merging install/upgrades/0_8_3.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_2a.php Auto-merging install/upgrades/0_8_2a.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_2.php Auto-merging install/upgrades/0_8_2.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_1.php Auto-merging install/upgrades/0_8_1.php CONFLICT (add/add): Merge conflict in install/templates/Windows_Device.xml.gz Auto-merging install/templates/Windows_Device.xml.gz CONFLICT (add/add): Merge conflict in install/templates/NetSNMP_Device.xml.gz Auto-merging install/templates/NetSNMP_Device.xml.gz CONFLICT (add/add): Merge conflict in install/templates/Local_Linux_Machine.xml.gz Auto-merging install/templates/Local_Linux_Machine.xml.gz CONFLICT (add/add): Merge conflict in install/templates/Generic_SNMP_Device.xml.gz Auto-merging install/templates/Generic_SNMP_Device.xml.gz CONFLICT (add/add): Merge conflict in install/templates/Cisco_Router.xml.gz Auto-merging install/templates/Cisco_Router.xml.gz CONFLICT (add/add): Merge conflict in install/templates/Cacti_Stats.xml.gz Auto-merging install/templates/Cacti_Stats.xml.gz CONFLICT (add/add): Merge conflict in install/step_json.php Auto-merging install/step_json.php CONFLICT (add/add): Merge conflict in install/install.php Auto-merging install/install.php CONFLICT (add/add): Merge conflict in install/install.js Auto-merging install/install.js CONFLICT (add/add): Merge conflict in install/install.css Auto-merging install/install.css CONFLICT (add/add): Merge conflict in install/index.php Auto-merging install/index.php CONFLICT (add/add): Merge conflict in install/functions.php Auto-merging install/functions.php CONFLICT (add/add): Merge conflict in install/cli_test.php Auto-merging install/cli_test.php CONFLICT (add/add): Merge conflict in install/cli_check.php Auto-merging install/cli_check.php CONFLICT (add/add): Merge conflict in install/background.php Auto-merging install/background.php CONFLICT (add/add): Merge conflict in index.php Auto-merging index.php CONFLICT (add/add): Merge conflict in include/vendor/phpsnmp/mib_parser.php Auto-merging include/vendor/phpsnmp/mib_parser.php CONFLICT (add/add): Merge conflict in include/vendor/phpsnmp/extension.php Auto-merging include/vendor/phpsnmp/extension.php CONFLICT (add/add): Merge conflict in include/vendor/phpsnmp/classSNMP.php Auto-merging include/vendor/phpsnmp/classSNMP.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/bootstrap.php Auto-merging include/vendor/phpseclib/bootstrap.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/System/SSH/Agent.php Auto-merging include/vendor/phpseclib/System/SSH/Agent.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/Net/SSH2.php Auto-merging include/vendor/phpseclib/Net/SSH2.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/Net/SFTP.php Auto-merging include/vendor/phpseclib/Net/SFTP.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/Math/BigInteger.php Auto-merging include/vendor/phpseclib/Math/BigInteger.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/File/X509.php Auto-merging include/vendor/phpseclib/File/X509.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/File/ASN1.php Auto-merging include/vendor/phpseclib/File/ASN1.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/Crypt/Twofish.php Auto-merging include/vendor/phpseclib/Crypt/Twofish.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/Crypt/Rijndael.php Auto-merging include/vendor/phpseclib/Crypt/Rijndael.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/Crypt/RSA.php Auto-merging include/vendor/phpseclib/Crypt/RSA.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/Crypt/RC2.php Auto-merging include/vendor/phpseclib/Crypt/RC2.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/Crypt/DES.php Auto-merging include/vendor/phpseclib/Crypt/DES.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/Crypt/Blowfish.php Auto-merging include/vendor/phpseclib/Crypt/Blowfish.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/Crypt/Base.php Auto-merging include/vendor/phpseclib/Crypt/Base.php CONFLICT (add/add): Merge conflict in include/vendor/gettext/tests/TranslatorTest.php Auto-merging include/vendor/gettext/tests/TranslatorTest.php CONFLICT (add/add): Merge conflict in include/vendor/gettext/src/translator_functions.php Auto-merging include/vendor/gettext/src/translator_functions.php CONFLICT (add/add): Merge conflict in include/vendor/gettext/CONTRIBUTING.md Auto-merging include/vendor/gettext/CONTRIBUTING.md CONFLICT (add/add): Merge conflict in include/vendor/csrf/csrf-conf.php Auto-merging include/vendor/csrf/csrf-conf.php CONFLICT (add/add): Merge conflict in include/vendor/cldr-to-gettext-plural-rules/bin/export-plural-rules Auto-merging include/vendor/cldr-to-gettext-plural-rules/bin/export-plural-rules CONFLICT (add/add): Merge conflict in include/vendor/GoogleAuthenticator/RuntimeException.php Auto-merging include/vendor/GoogleAuthenticator/RuntimeException.php CONFLICT (add/add): Merge conflict in include/vendor/GoogleAuthenticator/GoogleQrUrl.php Auto-merging include/vendor/GoogleAuthenticator/GoogleQrUrl.php CONFLICT (add/add): Merge conflict in include/vendor/GoogleAuthenticator/GoogleAuthenticatorInterface.php Auto-merging include/vendor/GoogleAuthenticator/GoogleAuthenticatorInterface.php CONFLICT (add/add): Merge conflict in include/vendor/GoogleAuthenticator/GoogleAuthenticator.php Auto-merging include/vendor/GoogleAuthenticator/GoogleAuthenticator.php CONFLICT (add/add): Merge conflict in include/vendor/GoogleAuthenticator/FixedBitNotation.php Auto-merging include/vendor/GoogleAuthenticator/FixedBitNotation.php CONFLICT (add/add): Merge conflict in include/top_header.php Auto-merging include/top_header.php CONFLICT (add/add): Merge conflict in include/top_graph_header.php Auto-merging include/top_graph_header.php CONFLICT (add/add): Merge conflict in include/top_general_header.php Auto-merging include/top_general_header.php CONFLICT (add/add): Merge conflict in include/themes/sunrise/main.js Auto-merging include/themes/sunrise/main.js CONFLICT (add/add): Merge conflict in include/themes/sunrise/main.css Auto-merging include/themes/sunrise/main.css CONFLICT (add/add): Merge conflict in include/themes/raspberry/main.js Auto-merging include/themes/raspberry/main.js CONFLICT (add/add): Merge conflict in include/themes/paw/main.js Auto-merging include/themes/paw/main.js CONFLICT (add/add): Merge conflict in include/themes/paw/main.css Auto-merging include/themes/paw/main.css CONFLICT (add/add): Merge conflict in include/themes/paw/jquery.timepicker.css Auto-merging include/themes/paw/jquery.timepicker.css CONFLICT (add/add): Merge conflict in include/themes/paper-plane/main.js Auto-merging include/themes/paper-plane/main.js CONFLICT (add/add): Merge conflict in include/themes/paper-plane/main.css Auto-merging include/themes/paper-plane/main.css CONFLICT (add/add): Merge conflict in include/themes/paper-plane/billboard.css Auto-merging include/themes/paper-plane/billboard.css CONFLICT (add/add): Merge conflict in include/themes/modern/main.js Auto-merging include/themes/modern/main.js CONFLICT (add/add): Merge conflict in include/themes/modern/main.css Auto-merging include/themes/modern/main.css CONFLICT (add/add): Merge conflict in include/themes/midwinter/rrdtheme.php Auto-merging include/themes/midwinter/rrdtheme.php CONFLICT (add/add): Merge conflict in include/themes/midwinter/pace.css Auto-merging include/themes/midwinter/pace.css CONFLICT (add/add): Merge conflict in include/themes/midwinter/main.js Auto-merging include/themes/midwinter/main.js CONFLICT (add/add): Merge conflict in include/themes/midwinter/main.css Auto-merging include/themes/midwinter/main.css CONFLICT (add/add): Merge conflict in include/themes/midwinter/jquery.zoom.css Auto-merging include/themes/midwinter/jquery.zoom.css CONFLICT (add/add): Merge conflict in include/themes/hollyberry/main.js Auto-merging include/themes/hollyberry/main.js CONFLICT (add/add): Merge conflict in include/themes/dark/main.js Auto-merging include/themes/dark/main.js CONFLICT (add/add): Merge conflict in include/themes/dark/main.css Auto-merging include/themes/dark/main.css CONFLICT (add/add): Merge conflict in include/themes/classic/main.css Auto-merging include/themes/classic/main.css CONFLICT (add/add): Merge conflict in include/themes/carrot/main.js Auto-merging include/themes/carrot/main.js CONFLICT (add/add): Merge conflict in include/themes/cacti/main.js Auto-merging include/themes/cacti/main.js CONFLICT (add/add): Merge conflict in include/session.php Auto-merging include/session.php CONFLICT (add/add): Merge conflict in include/realtime.js Auto-merging include/realtime.js CONFLICT (add/add): Merge conflict in include/plugins.php Auto-merging include/plugins.php CONFLICT (add/add): Merge conflict in include/layout.js Auto-merging include/layout.js CONFLICT (add/add): Merge conflict in include/js/pace.js Auto-merging include/js/pace.js CONFLICT (add/add): Merge conflict in include/js/jstree.js Auto-merging include/js/jstree.js CONFLICT (add/add): Merge conflict in include/js/jquery.zoom.js Auto-merging include/js/jquery.zoom.js CONFLICT (add/add): Merge conflict in include/js/jquery.multiselect.js Auto-merging include/js/jquery.multiselect.js CONFLICT (add/add): Merge conflict in include/js/jquery.js Auto-merging include/js/jquery.js CONFLICT (add/add): Merge conflict in include/js/jquery.dropdown.js Auto-merging include/js/jquery.dropdown.js CONFLICT (add/add): Merge conflict in include/js/jquery-ui.js Auto-merging include/js/jquery-ui.js CONFLICT (add/add): Merge conflict in include/js/billboard.js Auto-merging include/js/billboard.js CONFLICT (add/add): Merge conflict in include/global_settings.php Auto-merging include/global_settings.php CONFLICT (add/add): Merge conflict in include/global_session.php Auto-merging include/global_session.php CONFLICT (add/add): Merge conflict in include/global_languages.php Auto-merging include/global_languages.php CONFLICT (add/add): Merge conflict in include/global_form.php Auto-merging include/global_form.php CONFLICT (add/add): Merge conflict in include/global_constants.php Auto-merging include/global_constants.php CONFLICT (add/add): Merge conflict in include/global_arrays.php Auto-merging include/global_arrays.php CONFLICT (add/add): Merge conflict in include/global.php Auto-merging include/global.php CONFLICT (add/add): Merge conflict in include/fa/css/all.css Auto-merging include/fa/css/all.css CONFLICT (add/add): Merge conflict in include/csrf.php Auto-merging include/csrf.php CONFLICT (add/add): Merge conflict in include/config.php.dist Auto-merging include/config.php.dist CONFLICT (add/add): Merge conflict in include/cli_check.php Auto-merging include/cli_check.php CONFLICT (add/add): Merge conflict in include/bottom_footer.php Auto-merging include/bottom_footer.php CONFLICT (add/add): Merge conflict in include/auth.php Auto-merging include/auth.php CONFLICT (add/add): Merge conflict in images/cacti_logo_new.gif Auto-merging images/cacti_logo_new.gif CONFLICT (add/add): Merge conflict in images/cacti_logo.gif Auto-merging images/cacti_logo.gif CONFLICT (add/add): Merge conflict in host_templates.php Auto-merging host_templates.php CONFLICT (add/add): Merge conflict in host.php Auto-merging host.php CONFLICT (add/add): Merge conflict in graphs_new.php Auto-merging graphs_new.php CONFLICT (add/add): Merge conflict in graphs_items.php Auto-merging graphs_items.php CONFLICT (add/add): Merge conflict in graphs.php Auto-merging graphs.php CONFLICT (add/add): Merge conflict in graph_xport.php Auto-merging graph_xport.php CONFLICT (add/add): Merge conflict in graph_view.php Auto-merging graph_view.php CONFLICT (add/add): Merge conflict in graph_templates_items.php Auto-merging graph_templates_items.php CONFLICT (add/add): Merge conflict in graph_templates_inputs.php Auto-merging graph_templates_inputs.php CONFLICT (add/add): Merge conflict in graph_templates.php Auto-merging graph_templates.php CONFLICT (add/add): Merge conflict in graph_realtime.php Auto-merging graph_realtime.php CONFLICT (add/add): Merge conflict in graph_json.php Auto-merging graph_json.php CONFLICT (add/add): Merge conflict in graph_image.php Auto-merging graph_image.php CONFLICT (add/add): Merge conflict in graph.php Auto-merging graph.php CONFLICT (add/add): Merge conflict in gprint_presets.php Auto-merging gprint_presets.php CONFLICT (add/add): Merge conflict in formats/cacti_monitor.format Auto-merging formats/cacti_monitor.format CONFLICT (add/add): Merge conflict in formats/cacti_group_dark.format Auto-merging formats/cacti_group_dark.format CONFLICT (add/add): Merge conflict in formats/cacti_group.format Auto-merging formats/cacti_group.format CONFLICT (add/add): Merge conflict in docs/index.php Auto-merging docs/index.php CONFLICT (add/add): Merge conflict in docs/audit_schema.sql Auto-merging docs/audit_schema.sql CONFLICT (add/add): Merge conflict in docs/README.md Auto-merging docs/README.md CONFLICT (add/add): Merge conflict in data_templates.php Auto-merging data_templates.php CONFLICT (add/add): Merge conflict in data_sources.php Auto-merging data_sources.php CONFLICT (add/add): Merge conflict in data_source_profiles.php Auto-merging data_source_profiles.php CONFLICT (add/add): Merge conflict in data_queries.php Auto-merging data_queries.php CONFLICT (add/add): Merge conflict in data_input.php Auto-merging data_input.php CONFLICT (add/add): Merge conflict in data_debug.php Auto-merging data_debug.php CONFLICT (add/add): Merge conflict in color_templates_items.php Auto-merging color_templates_items.php CONFLICT (add/add): Merge conflict in color_templates.php Auto-merging color_templates.php CONFLICT (add/add): Merge conflict in color.php Auto-merging color.php CONFLICT (add/add): Merge conflict in cmd_realtime.php Auto-merging cmd_realtime.php CONFLICT (add/add): Merge conflict in cmd.php Auto-merging cmd.php CONFLICT (add/add): Merge conflict in clog_user.php Auto-merging clog_user.php CONFLICT (add/add): Merge conflict in clog.php Auto-merging clog.php CONFLICT (add/add): Merge conflict in cli/version.php Auto-merging cli/version.php CONFLICT (add/add): Merge conflict in cli/upgrade_database.php Auto-merging cli/upgrade_database.php CONFLICT (add/add): Merge conflict in cli/structure_rra_paths.php Auto-merging cli/structure_rra_paths.php CONFLICT (add/add): Merge conflict in cli/sqltable_to_php.php Auto-merging cli/sqltable_to_php.php CONFLICT (add/add): Merge conflict in cli/splice_rrd.php Auto-merging cli/splice_rrd.php CONFLICT (add/add): Merge conflict in cli/show_perms.php Auto-merging cli/show_perms.php CONFLICT (add/add): Merge conflict in cli/rrdresize.php Auto-merging cli/rrdresize.php CONFLICT (add/add): Merge conflict in cli/repair_templates.php Auto-merging cli/repair_templates.php CONFLICT (add/add): Merge conflict in cli/repair_graphs.php Auto-merging cli/repair_graphs.php CONFLICT (add/add): Merge conflict in cli/repair_database.php Auto-merging cli/repair_database.php CONFLICT (add/add): Merge conflict in cli/reorder_data_query.php Auto-merging cli/reorder_data_query.php CONFLICT (add/add): Merge conflict in cli/removespikes.php Auto-merging cli/removespikes.php CONFLICT (add/add): Merge conflict in cli/remove_graphs.php Auto-merging cli/remove_graphs.php CONFLICT (add/add): Merge conflict in cli/remove_device.php Auto-merging cli/remove_device.php CONFLICT (add/add): Merge conflict in cli/refresh_csrf.php Auto-merging cli/refresh_csrf.php CONFLICT (add/add): Merge conflict in cli/rebuild_poller_cache.php Auto-merging cli/rebuild_poller_cache.php CONFLICT (add/add): Merge conflict in cli/poller_replicate.php Auto-merging cli/poller_replicate.php CONFLICT (add/add): Merge conflict in cli/poller_reindex_hosts.php Auto-merging cli/poller_reindex_hosts.php CONFLICT (add/add): Merge conflict in cli/poller_output_empty.php Auto-merging cli/poller_output_empty.php CONFLICT (add/add): Merge conflict in cli/poller_graphs_reapply_names.php Auto-merging cli/poller_graphs_reapply_names.php CONFLICT (add/add): Merge conflict in cli/poller_data_sources_reapply_names.php Auto-merging cli/poller_data_sources_reapply_names.php CONFLICT (add/add): Merge conflict in cli/md5sum.php Auto-merging cli/md5sum.php CONFLICT (add/add): Merge conflict in cli/install_cacti.php Auto-merging cli/install_cacti.php CONFLICT (add/add): Merge conflict in cli/input_whitelist.php Auto-merging cli/input_whitelist.php CONFLICT (add/add): Merge conflict in cli/import_template.php Auto-merging cli/import_template.php CONFLICT (add/add): Merge conflict in cli/import_package.php Auto-merging cli/import_package.php CONFLICT (add/add): Merge conflict in cli/host_update_template.php Auto-merging cli/host_update_template.php CONFLICT (add/add): Merge conflict in cli/fix_mediumint.php Auto-merging cli/fix_mediumint.php CONFLICT (add/add): Merge conflict in cli/copy_user.php Auto-merging cli/copy_user.php CONFLICT (add/add): Merge conflict in cli/convert_tables.php Auto-merging cli/convert_tables.php CONFLICT (add/add): Merge conflict in cli/change_device.php Auto-merging cli/change_device.php CONFLICT (add/add): Merge conflict in cli/audit_database.php Auto-merging cli/audit_database.php CONFLICT (add/add): Merge conflict in cli/apply_automation_rules.php Auto-merging cli/apply_automation_rules.php CONFLICT (add/add): Merge conflict in cli/analyze_database.php Auto-merging cli/analyze_database.php CONFLICT (add/add): Merge conflict in cli/add_tree.php Auto-merging cli/add_tree.php CONFLICT (add/add): Merge conflict in cli/add_site.php Auto-merging cli/add_site.php CONFLICT (add/add): Merge conflict in cli/add_perms.php Auto-merging cli/add_perms.php CONFLICT (add/add): Merge conflict in cli/add_graphs.php Auto-merging cli/add_graphs.php CONFLICT (add/add): Merge conflict in cli/add_graph_template.php Auto-merging cli/add_graph_template.php CONFLICT (add/add): Merge conflict in cli/add_device.php Auto-merging cli/add_device.php CONFLICT (add/add): Merge conflict in cli/add_datasource.php Auto-merging cli/add_datasource.php CONFLICT (add/add): Merge conflict in cli/add_data_query.php Auto-merging cli/add_data_query.php CONFLICT (add/add): Merge conflict in changelog.php Auto-merging changelog.php CONFLICT (add/add): Merge conflict in cdef.php Auto-merging cdef.php CONFLICT (add/add): Merge conflict in cactid.php Auto-merging cactid.php CONFLICT (add/add): Merge conflict in cacti.sql Auto-merging cacti.sql CONFLICT (add/add): Merge conflict in boost_rrdupdate.php Auto-merging boost_rrdupdate.php CONFLICT (add/add): Merge conflict in automation_tree_rules.php Auto-merging automation_tree_rules.php CONFLICT (add/add): Merge conflict in automation_templates.php Auto-merging automation_templates.php CONFLICT (add/add): Merge conflict in automation_snmp.php Auto-merging automation_snmp.php CONFLICT (add/add): Merge conflict in automation_networks.php Auto-merging automation_networks.php CONFLICT (add/add): Merge conflict in automation_graph_rules.php Auto-merging automation_graph_rules.php CONFLICT (add/add): Merge conflict in automation_devices.php Auto-merging automation_devices.php CONFLICT (add/add): Merge conflict in auth_profile.php Auto-merging auth_profile.php CONFLICT (add/add): Merge conflict in auth_login.php Auto-merging auth_login.php CONFLICT (add/add): Merge conflict in auth_changepassword.php Auto-merging auth_changepassword.php CONFLICT (add/add): Merge conflict in auth_2fa.php Auto-merging auth_2fa.php CONFLICT (add/add): Merge conflict in aggregate_templates.php Auto-merging aggregate_templates.php CONFLICT (add/add): Merge conflict in aggregate_items.php Auto-merging aggregate_items.php CONFLICT (add/add): Merge conflict in aggregate_graphs.php Auto-merging aggregate_graphs.php CONFLICT (add/add): Merge conflict in about.php Auto-merging about.php CONFLICT (add/add): Merge conflict in README.md Auto-merging README.md CONFLICT (add/add): Merge conflict in LICENSE Auto-merging LICENSE CONFLICT (add/add): Merge conflict in CHANGELOG Auto-merging CHANGELOG CONFLICT (add/add): Merge conflict in .travis.yml Auto-merging .travis.yml CONFLICT (add/add): Merge conflict in .gitignore Auto-merging .gitignore error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 Correct header shebang Resolve all conflicts manually, mark them as resolved with "git add/rm <conflicted_files>", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort". (1)a year ago
First, rewinding head to replay your work on top of it... Applying: Correct header shebang .git/rebase-apply/patch:4106: trailing whitespace. With that said, there are several changes that you MUST perform to MySQL/MariaDB .git/rebase-apply/patch:4160: trailing whitespace. do .git/rebase-apply/patch:4269: trailing whitespace. ### Check out the Cacti Group's Official YouTube channel .git/rebase-apply/patch:4425: trailing whitespace. If a vulnerability is reproducible with evidence, please .git/rebase-apply/patch:4426: trailing whitespace. contact us on [email protected]. We would appreciate warning: squelched 2355 whitespace errors warning: 2360 lines add whitespace errors. Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. warning: Cannot merge binary files: locales/LC_MESSAGES/zh-TW.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/zh-CN.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/vi-VN.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/tr-TR.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/sv-SE.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/ru-RU.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/pt-PT.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/pt-BR.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/pl-PL.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/nl-NL.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/ko-KR.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/ja-JP.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/it-IT.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/hi-IN.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/he-IL.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/fr-FR.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/es-ES.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/el-GR.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/de-DE.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/bg-BG.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/ar-SA.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: install/templates/Windows_Device.xml.gz (HEAD vs. Correct header shebang) warning: Cannot merge binary files: install/templates/NetSNMP_Device.xml.gz (HEAD vs. Correct header shebang) warning: Cannot merge binary files: install/templates/Local_Linux_Machine.xml.gz (HEAD vs. Correct header shebang) warning: Cannot merge binary files: install/templates/Generic_SNMP_Device.xml.gz (HEAD vs. Correct header shebang) warning: Cannot merge binary files: install/templates/Cisco_Router.xml.gz (HEAD vs. Correct header shebang) warning: Cannot merge binary files: install/templates/Cacti_Stats.xml.gz (HEAD vs. Correct header shebang) warning: Cannot merge binary files: images/cacti_logo_new.gif (HEAD vs. Correct header shebang) warning: Cannot merge binary files: images/cacti_logo.gif (HEAD vs. Correct header shebang) CONFLICT (add/add): Merge conflict in vdef.php Auto-merging vdef.php CONFLICT (add/add): Merge conflict in utilities.php Auto-merging utilities.php CONFLICT (add/add): Merge conflict in user_group_admin.php Auto-merging user_group_admin.php CONFLICT (add/add): Merge conflict in user_domains.php Auto-merging user_domains.php CONFLICT (add/add): Merge conflict in user_admin.php Auto-merging user_admin.php CONFLICT (add/add): Merge conflict in tree.php Auto-merging tree.php CONFLICT (add/add): Merge conflict in tests/tools/check_install_code.php Auto-merging tests/tools/check_install_code.php CONFLICT (add/add): Merge conflict in tests/tools/check_cli_version.sh Auto-merging tests/tools/check_cli_version.sh CONFLICT (add/add): Merge conflict in tests/tools/check_all_pages.sh Auto-merging tests/tools/check_all_pages.sh CONFLICT (add/add): Merge conflict in tests/tools/cacti.conf Auto-merging tests/tools/cacti.conf CONFLICT (add/add): Merge conflict in templates_import.php Auto-merging templates_import.php CONFLICT (add/add): Merge conflict in templates_export.php Auto-merging templates_export.php CONFLICT (add/add): Merge conflict in support.php Auto-merging support.php CONFLICT (add/add): Merge conflict in spikekill.php Auto-merging spikekill.php CONFLICT (add/add): Merge conflict in snmpagent_persist.php Auto-merging snmpagent_persist.php CONFLICT (add/add): Merge conflict in snmpagent_mibcachechild.php Auto-merging snmpagent_mibcachechild.php CONFLICT (add/add): Merge conflict in snmpagent_mibcache.php Auto-merging snmpagent_mibcache.php CONFLICT (add/add): Merge conflict in sites.php Auto-merging sites.php CONFLICT (add/add): Merge conflict in settings.php Auto-merging settings.php CONFLICT (add/add): Merge conflict in service/README.md Auto-merging service/README.md CONFLICT (add/add): Merge conflict in scripts/weatherbug.pl Auto-merging scripts/weatherbug.pl CONFLICT (add/add): Merge conflict in scripts/ss_webseer.php Auto-merging scripts/ss_webseer.php CONFLICT (add/add): Merge conflict in scripts/ss_sql.php Auto-merging scripts/ss_sql.php CONFLICT (add/add): Merge conflict in scripts/ss_poller.php Auto-merging scripts/ss_poller.php CONFLICT (add/add): Merge conflict in scripts/ss_net_snmp_disk_io.php Auto-merging scripts/ss_net_snmp_disk_io.php CONFLICT (add/add): Merge conflict in scripts/ss_net_snmp_disk_bytes.php Auto-merging scripts/ss_net_snmp_disk_bytes.php CONFLICT (add/add): Merge conflict in scripts/ss_hstats.php Auto-merging scripts/ss_hstats.php CONFLICT (add/add): Merge conflict in scripts/ss_host_disk.php Auto-merging scripts/ss_host_disk.php CONFLICT (add/add): Merge conflict in scripts/ss_host_cpu.php Auto-merging scripts/ss_host_cpu.php CONFLICT (add/add): Merge conflict in scripts/ss_gexport.php Auto-merging scripts/ss_gexport.php CONFLICT (add/add): Merge conflict in scripts/ss_fping.php Auto-merging scripts/ss_fping.php CONFLICT (add/add): Merge conflict in scripts/ss_cpoller.php Auto-merging scripts/ss_cpoller.php CONFLICT (add/add): Merge conflict in scripts/ss_count_oids.php Auto-merging scripts/ss_count_oids.php CONFLICT (add/add): Merge conflict in scripts/cacti_user_stats.php Auto-merging scripts/cacti_user_stats.php CONFLICT (add/add): Merge conflict in script_server.php Auto-merging script_server.php CONFLICT (add/add): Merge conflict in rrdcleaner.php Auto-merging rrdcleaner.php CONFLICT (add/add): Merge conflict in resource/snmp_queries/interface.xml Auto-merging resource/snmp_queries/interface.xml CONFLICT (add/add): Merge conflict in resource/script_server/webseer.xml Auto-merging resource/script_server/webseer.xml CONFLICT (add/add): Merge conflict in resource/script_server/host_disk.xml Auto-merging resource/script_server/host_disk.xml CONFLICT (add/add): Merge conflict in resource/script_server/host_cpu.xml Auto-merging resource/script_server/host_cpu.xml CONFLICT (add/add): Merge conflict in resource/script_server/gexport.xml Auto-merging resource/script_server/gexport.xml CONFLICT (add/add): Merge conflict in resource/script_server/cpoller.xml Auto-merging resource/script_server/cpoller.xml CONFLICT (add/add): Merge conflict in resource/script_queries/unix_disk.xml Auto-merging resource/script_queries/unix_disk.xml CONFLICT (add/add): Merge conflict in resource/script_queries/host_disk.xml Auto-merging resource/script_queries/host_disk.xml CONFLICT (add/add): Merge conflict in resource/script_queries/host_cpu.xml Auto-merging resource/script_queries/host_cpu.xml CONFLICT (add/add): Merge conflict in reports_user.php Auto-merging reports_user.php CONFLICT (add/add): Merge conflict in reports_admin.php Auto-merging reports_admin.php CONFLICT (add/add): Merge conflict in remote_agent.php Auto-merging remote_agent.php CONFLICT (add/add): Merge conflict in pollers.php Auto-merging pollers.php CONFLICT (add/add): Merge conflict in poller_spikekill.php Auto-merging poller_spikekill.php CONFLICT (add/add): Merge conflict in poller_reports.php Auto-merging poller_reports.php CONFLICT (add/add): Merge conflict in poller_recovery.php Auto-merging poller_recovery.php CONFLICT (add/add): Merge conflict in poller_realtime.php Auto-merging poller_realtime.php CONFLICT (add/add): Merge conflict in poller_maintenance.php Auto-merging poller_maintenance.php CONFLICT (add/add): Merge conflict in poller_dsstats.php Auto-merging poller_dsstats.php CONFLICT (add/add): Merge conflict in poller_commands.php Auto-merging poller_commands.php CONFLICT (add/add): Merge conflict in poller_boost.php Auto-merging poller_boost.php CONFLICT (add/add): Merge conflict in poller_automation.php Auto-merging poller_automation.php CONFLICT (add/add): Merge conflict in poller.php Auto-merging poller.php CONFLICT (add/add): Merge conflict in plugins.php Auto-merging plugins.php CONFLICT (add/add): Merge conflict in permission_denied.php Auto-merging permission_denied.php CONFLICT (add/add): Merge conflict in mibs/CACTI-SNMPAGENT-MIB Auto-merging mibs/CACTI-SNMPAGENT-MIB CONFLICT (add/add): Merge conflict in mibs/CACTI-MIB Auto-merging mibs/CACTI-MIB CONFLICT (add/add): Merge conflict in mibs/CACTI-BOOST-MIB Auto-merging mibs/CACTI-BOOST-MIB CONFLICT (add/add): Merge conflict in managers.php Auto-merging managers.php CONFLICT (add/add): Merge conflict in logout.php Auto-merging logout.php CONFLICT (add/add): Merge conflict in locales/po/zh-TW.po Auto-merging locales/po/zh-TW.po CONFLICT (add/add): Merge conflict in locales/po/zh-CN.po Auto-merging locales/po/zh-CN.po CONFLICT (add/add): Merge conflict in locales/po/vi-VN.po Auto-merging locales/po/vi-VN.po CONFLICT (add/add): Merge conflict in locales/po/tr-TR.po Auto-merging locales/po/tr-TR.po CONFLICT (add/add): Merge conflict in locales/po/sv-SE.po Auto-merging locales/po/sv-SE.po CONFLICT (add/add): Merge conflict in locales/po/ru-RU.po Auto-merging locales/po/ru-RU.po CONFLICT (add/add): Merge conflict in locales/po/pt-PT.po Auto-merging locales/po/pt-PT.po CONFLICT (add/add): Merge conflict in locales/po/pt-BR.po Auto-merging locales/po/pt-BR.po CONFLICT (add/add): Merge conflict in locales/po/pl-PL.po Auto-merging locales/po/pl-PL.po CONFLICT (add/add): Merge conflict in locales/po/nl-NL.po Auto-merging locales/po/nl-NL.po CONFLICT (add/add): Merge conflict in locales/po/ko-KR.po Auto-merging locales/po/ko-KR.po CONFLICT (add/add): Merge conflict in locales/po/ja-JP.po Auto-merging locales/po/ja-JP.po CONFLICT (add/add): Merge conflict in locales/po/it-IT.po Auto-merging locales/po/it-IT.po CONFLICT (add/add): Merge conflict in locales/po/hi-IN.po Auto-merging locales/po/hi-IN.po CONFLICT (add/add): Merge conflict in locales/po/he-IL.po Auto-merging locales/po/he-IL.po CONFLICT (add/add): Merge conflict in locales/po/fr-FR.po Auto-merging locales/po/fr-FR.po CONFLICT (add/add): Merge conflict in locales/po/es-ES.po Auto-merging locales/po/es-ES.po CONFLICT (add/add): Merge conflict in locales/po/el-GR.po Auto-merging locales/po/el-GR.po CONFLICT (add/add): Merge conflict in locales/po/de-DE.po Auto-merging locales/po/de-DE.po CONFLICT (add/add): Merge conflict in locales/po/cacti.pot Auto-merging locales/po/cacti.pot CONFLICT (add/add): Merge conflict in locales/po/bg-BG.po Auto-merging locales/po/bg-BG.po CONFLICT (add/add): Merge conflict in locales/po/ar-SA.po Auto-merging locales/po/ar-SA.po CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/zh-TW.mo Auto-merging locales/LC_MESSAGES/zh-TW.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/zh-CN.mo Auto-merging locales/LC_MESSAGES/zh-CN.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/vi-VN.mo Auto-merging locales/LC_MESSAGES/vi-VN.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/tr-TR.mo Auto-merging locales/LC_MESSAGES/tr-TR.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/sv-SE.mo Auto-merging locales/LC_MESSAGES/sv-SE.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/ru-RU.mo Auto-merging locales/LC_MESSAGES/ru-RU.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/pt-PT.mo Auto-merging locales/LC_MESSAGES/pt-PT.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/pt-BR.mo Auto-merging locales/LC_MESSAGES/pt-BR.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/pl-PL.mo Auto-merging locales/LC_MESSAGES/pl-PL.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/nl-NL.mo Auto-merging locales/LC_MESSAGES/nl-NL.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/ko-KR.mo Auto-merging locales/LC_MESSAGES/ko-KR.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/ja-JP.mo Auto-merging locales/LC_MESSAGES/ja-JP.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/it-IT.mo Auto-merging locales/LC_MESSAGES/it-IT.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/hi-IN.mo Auto-merging locales/LC_MESSAGES/hi-IN.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/he-IL.mo Auto-merging locales/LC_MESSAGES/he-IL.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/fr-FR.mo Auto-merging locales/LC_MESSAGES/fr-FR.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/es-ES.mo Auto-merging locales/LC_MESSAGES/es-ES.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/el-GR.mo Auto-merging locales/LC_MESSAGES/el-GR.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/de-DE.mo Auto-merging locales/LC_MESSAGES/de-DE.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/bg-BG.mo Auto-merging locales/LC_MESSAGES/bg-BG.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/ar-SA.mo Auto-merging locales/LC_MESSAGES/ar-SA.mo CONFLICT (add/add): Merge conflict in links.php Auto-merging links.php CONFLICT (add/add): Merge conflict in link.php Auto-merging link.php CONFLICT (add/add): Merge conflict in lib/xml.php Auto-merging lib/xml.php CONFLICT (add/add): Merge conflict in lib/vdef.php Auto-merging lib/vdef.php CONFLICT (add/add): Merge conflict in lib/variables.php Auto-merging lib/variables.php CONFLICT (add/add): Merge conflict in lib/utility.php Auto-merging lib/utility.php CONFLICT (add/add): Merge conflict in lib/timespan_settings.php Auto-merging lib/timespan_settings.php CONFLICT (add/add): Merge conflict in lib/time.php Auto-merging lib/time.php CONFLICT (add/add): Merge conflict in lib/template.php Auto-merging lib/template.php CONFLICT (add/add): Merge conflict in lib/spikekill.php Auto-merging lib/spikekill.php CONFLICT (add/add): Merge conflict in lib/sort.php Auto-merging lib/sort.php CONFLICT (add/add): Merge conflict in lib/snmpagent.php Auto-merging lib/snmpagent.php CONFLICT (add/add): Merge conflict in lib/snmp.php Auto-merging lib/snmp.php CONFLICT (add/add): Merge conflict in lib/rrd.php Auto-merging lib/rrd.php CONFLICT (add/add): Merge conflict in lib/reports.php Auto-merging lib/reports.php CONFLICT (add/add): Merge conflict in lib/poller.php Auto-merging lib/poller.php CONFLICT (add/add): Merge conflict in lib/plugins.php Auto-merging lib/plugins.php CONFLICT (add/add): Merge conflict in lib/ping.php Auto-merging lib/ping.php CONFLICT (add/add): Merge conflict in lib/mib_cache.php Auto-merging lib/mib_cache.php CONFLICT (add/add): Merge conflict in lib/ldap.php Auto-merging lib/ldap.php CONFLICT (add/add): Merge conflict in lib/installer.php Auto-merging lib/installer.php CONFLICT (add/add): Merge conflict in lib/import.php Auto-merging lib/import.php CONFLICT (add/add): Merge conflict in lib/html_validate.php Auto-merging lib/html_validate.php CONFLICT (add/add): Merge conflict in lib/html_utility.php Auto-merging lib/html_utility.php CONFLICT (add/add): Merge conflict in lib/html_tree.php Auto-merging lib/html_tree.php CONFLICT (add/add): Merge conflict in lib/html_reports.php Auto-merging lib/html_reports.php CONFLICT (add/add): Merge conflict in lib/html_graph.php Auto-merging lib/html_graph.php CONFLICT (add/add): Merge conflict in lib/html_form_template.php Auto-merging lib/html_form_template.php CONFLICT (add/add): Merge conflict in lib/html_form.php Auto-merging lib/html_form.php CONFLICT (add/add): Merge conflict in lib/html_filter.php Auto-merging lib/html_filter.php CONFLICT (add/add): Merge conflict in lib/html.php Auto-merging lib/html.php CONFLICT (add/add): Merge conflict in lib/graphs.php Auto-merging lib/graphs.php CONFLICT (add/add): Merge conflict in lib/graph_variables.php Auto-merging lib/graph_variables.php CONFLICT (add/add): Merge conflict in lib/functions.php Auto-merging lib/functions.php CONFLICT (add/add): Merge conflict in lib/export.php Auto-merging lib/export.php CONFLICT (add/add): Merge conflict in lib/dsstats.php Auto-merging lib/dsstats.php CONFLICT (add/add): Merge conflict in lib/dsdebug.php Auto-merging lib/dsdebug.php CONFLICT (add/add): Merge conflict in lib/database.php Auto-merging lib/database.php CONFLICT (add/add): Merge conflict in lib/data_query.php Auto-merging lib/data_query.php CONFLICT (add/add): Merge conflict in lib/clog_webapi.php Auto-merging lib/clog_webapi.php CONFLICT (add/add): Merge conflict in lib/cdef.php Auto-merging lib/cdef.php CONFLICT (add/add): Merge conflict in lib/boost.php Auto-merging lib/boost.php CONFLICT (add/add): Merge conflict in lib/auth.php Auto-merging lib/auth.php CONFLICT (add/add): Merge conflict in lib/api_tree.php Auto-merging lib/api_tree.php CONFLICT (add/add): Merge conflict in lib/api_poller.php Auto-merging lib/api_poller.php CONFLICT (add/add): Merge conflict in lib/api_graph.php Auto-merging lib/api_graph.php CONFLICT (add/add): Merge conflict in lib/api_device.php Auto-merging lib/api_device.php CONFLICT (add/add): Merge conflict in lib/api_data_source.php Auto-merging lib/api_data_source.php CONFLICT (add/add): Merge conflict in lib/api_automation_tools.php Auto-merging lib/api_automation_tools.php CONFLICT (add/add): Merge conflict in lib/api_automation.php Auto-merging lib/api_automation.php CONFLICT (add/add): Merge conflict in lib/api_aggregate.php Auto-merging lib/api_aggregate.php CONFLICT (add/add): Merge conflict in lib/aggregate.php Auto-merging lib/aggregate.php CONFLICT (add/add): Merge conflict in install/upgrades/1_3_0.php Auto-merging install/upgrades/1_3_0.php CONFLICT (add/add): Merge conflict in install/upgrades/1_2_8.php Auto-merging install/upgrades/1_2_8.php CONFLICT (add/add): Merge conflict in install/upgrades/1_2_7.php Auto-merging install/upgrades/1_2_7.php CONFLICT (add/add): Merge conflict in install/upgrades/1_2_5.php Auto-merging install/upgrades/1_2_5.php CONFLICT (add/add): Merge conflict in install/upgrades/1_2_3.php Auto-merging install/upgrades/1_2_3.php CONFLICT (add/add): Merge conflict in install/upgrades/1_2_2.php Auto-merging install/upgrades/1_2_2.php CONFLICT (add/add): Merge conflict in install/upgrades/1_2_17.php Auto-merging install/upgrades/1_2_17.php CONFLICT (add/add): Merge conflict in install/upgrades/1_2_15.php Auto-merging install/upgrades/1_2_15.php CONFLICT (add/add): Merge conflict in install/upgrades/1_2_14.php Auto-merging install/upgrades/1_2_14.php CONFLICT (add/add): Merge conflict in install/upgrades/1_2_11.php Auto-merging install/upgrades/1_2_11.php CONFLICT (add/add): Merge conflict in install/upgrades/1_2_1.php Auto-merging install/upgrades/1_2_1.php CONFLICT (add/add): Merge conflict in install/upgrades/1_2_0.php Auto-merging install/upgrades/1_2_0.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_8.php Auto-merging install/upgrades/1_1_8.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_7.php Auto-merging install/upgrades/1_1_7.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_6.php Auto-merging install/upgrades/1_1_6.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_4.php Auto-merging install/upgrades/1_1_4.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_37.php Auto-merging install/upgrades/1_1_37.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_36.php Auto-merging install/upgrades/1_1_36.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_35.php Auto-merging install/upgrades/1_1_35.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_34.php Auto-merging install/upgrades/1_1_34.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_31.php Auto-merging install/upgrades/1_1_31.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_28.php Auto-merging install/upgrades/1_1_28.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_26.php Auto-merging install/upgrades/1_1_26.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_20.php Auto-merging install/upgrades/1_1_20.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_2.php Auto-merging install/upgrades/1_1_2.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_17.php Auto-merging install/upgrades/1_1_17.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_14.php Auto-merging install/upgrades/1_1_14.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_11.php Auto-merging install/upgrades/1_1_11.php CONFLICT (add/add): Merge conflict in install/upgrades/1_0_5.php Auto-merging install/upgrades/1_0_5.php CONFLICT (add/add): Merge conflict in install/upgrades/1_0_4.php Auto-merging install/upgrades/1_0_4.php CONFLICT (add/add): Merge conflict in install/upgrades/1_0_0.php Auto-merging install/upgrades/1_0_0.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_8.php Auto-merging install/upgrades/0_8_8.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_7h.php Auto-merging install/upgrades/0_8_7h.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_7c.php Auto-merging install/upgrades/0_8_7c.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_7b.php Auto-merging install/upgrades/0_8_7b.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_7a.php Auto-merging install/upgrades/0_8_7a.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_7.php Auto-merging install/upgrades/0_8_7.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_6i.php Auto-merging install/upgrades/0_8_6i.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_6h.php Auto-merging install/upgrades/0_8_6h.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_6g.php Auto-merging install/upgrades/0_8_6g.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_6e.php Auto-merging install/upgrades/0_8_6e.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_6d.php Auto-merging install/upgrades/0_8_6d.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_6a.php Auto-merging install/upgrades/0_8_6a.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_6.php Auto-merging install/upgrades/0_8_6.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_5.php Auto-merging install/upgrades/0_8_5.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_4.php Auto-merging install/upgrades/0_8_4.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_3.php Auto-merging install/upgrades/0_8_3.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_2a.php Auto-merging install/upgrades/0_8_2a.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_2.php Auto-merging install/upgrades/0_8_2.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_1.php Auto-merging install/upgrades/0_8_1.php CONFLICT (add/add): Merge conflict in install/templates/Windows_Device.xml.gz Auto-merging install/templates/Windows_Device.xml.gz CONFLICT (add/add): Merge conflict in install/templates/NetSNMP_Device.xml.gz Auto-merging install/templates/NetSNMP_Device.xml.gz CONFLICT (add/add): Merge conflict in install/templates/Local_Linux_Machine.xml.gz Auto-merging install/templates/Local_Linux_Machine.xml.gz CONFLICT (add/add): Merge conflict in install/templates/Generic_SNMP_Device.xml.gz Auto-merging install/templates/Generic_SNMP_Device.xml.gz CONFLICT (add/add): Merge conflict in install/templates/Cisco_Router.xml.gz Auto-merging install/templates/Cisco_Router.xml.gz CONFLICT (add/add): Merge conflict in install/templates/Cacti_Stats.xml.gz Auto-merging install/templates/Cacti_Stats.xml.gz CONFLICT (add/add): Merge conflict in install/step_json.php Auto-merging install/step_json.php CONFLICT (add/add): Merge conflict in install/install.php Auto-merging install/install.php CONFLICT (add/add): Merge conflict in install/install.js Auto-merging install/install.js CONFLICT (add/add): Merge conflict in install/install.css Auto-merging install/install.css CONFLICT (add/add): Merge conflict in install/index.php Auto-merging install/index.php CONFLICT (add/add): Merge conflict in install/functions.php Auto-merging install/functions.php CONFLICT (add/add): Merge conflict in install/cli_test.php Auto-merging install/cli_test.php CONFLICT (add/add): Merge conflict in install/cli_check.php Auto-merging install/cli_check.php CONFLICT (add/add): Merge conflict in install/background.php Auto-merging install/background.php CONFLICT (add/add): Merge conflict in index.php Auto-merging index.php CONFLICT (add/add): Merge conflict in include/vendor/phpsnmp/mib_parser.php Auto-merging include/vendor/phpsnmp/mib_parser.php CONFLICT (add/add): Merge conflict in include/vendor/phpsnmp/extension.php Auto-merging include/vendor/phpsnmp/extension.php CONFLICT (add/add): Merge conflict in include/vendor/phpsnmp/classSNMP.php Auto-merging include/vendor/phpsnmp/classSNMP.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/bootstrap.php Auto-merging include/vendor/phpseclib/bootstrap.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/System/SSH/Agent.php Auto-merging include/vendor/phpseclib/System/SSH/Agent.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/Net/SSH2.php Auto-merging include/vendor/phpseclib/Net/SSH2.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/Net/SFTP.php Auto-merging include/vendor/phpseclib/Net/SFTP.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/Math/BigInteger.php Auto-merging include/vendor/phpseclib/Math/BigInteger.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/File/X509.php Auto-merging include/vendor/phpseclib/File/X509.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/File/ASN1.php Auto-merging include/vendor/phpseclib/File/ASN1.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/Crypt/Twofish.php Auto-merging include/vendor/phpseclib/Crypt/Twofish.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/Crypt/Rijndael.php Auto-merging include/vendor/phpseclib/Crypt/Rijndael.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/Crypt/RSA.php Auto-merging include/vendor/phpseclib/Crypt/RSA.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/Crypt/RC2.php Auto-merging include/vendor/phpseclib/Crypt/RC2.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/Crypt/DES.php Auto-merging include/vendor/phpseclib/Crypt/DES.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/Crypt/Blowfish.php Auto-merging include/vendor/phpseclib/Crypt/Blowfish.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/Crypt/Base.php Auto-merging include/vendor/phpseclib/Crypt/Base.php CONFLICT (add/add): Merge conflict in include/vendor/gettext/tests/TranslatorTest.php Auto-merging include/vendor/gettext/tests/TranslatorTest.php CONFLICT (add/add): Merge conflict in include/vendor/gettext/src/translator_functions.php Auto-merging include/vendor/gettext/src/translator_functions.php CONFLICT (add/add): Merge conflict in include/vendor/gettext/CONTRIBUTING.md Auto-merging include/vendor/gettext/CONTRIBUTING.md CONFLICT (add/add): Merge conflict in include/vendor/csrf/csrf-conf.php Auto-merging include/vendor/csrf/csrf-conf.php CONFLICT (add/add): Merge conflict in include/vendor/cldr-to-gettext-plural-rules/bin/export-plural-rules Auto-merging include/vendor/cldr-to-gettext-plural-rules/bin/export-plural-rules CONFLICT (add/add): Merge conflict in include/vendor/GoogleAuthenticator/RuntimeException.php Auto-merging include/vendor/GoogleAuthenticator/RuntimeException.php CONFLICT (add/add): Merge conflict in include/vendor/GoogleAuthenticator/GoogleQrUrl.php Auto-merging include/vendor/GoogleAuthenticator/GoogleQrUrl.php CONFLICT (add/add): Merge conflict in include/vendor/GoogleAuthenticator/GoogleAuthenticatorInterface.php Auto-merging include/vendor/GoogleAuthenticator/GoogleAuthenticatorInterface.php CONFLICT (add/add): Merge conflict in include/vendor/GoogleAuthenticator/GoogleAuthenticator.php Auto-merging include/vendor/GoogleAuthenticator/GoogleAuthenticator.php CONFLICT (add/add): Merge conflict in include/vendor/GoogleAuthenticator/FixedBitNotation.php Auto-merging include/vendor/GoogleAuthenticator/FixedBitNotation.php CONFLICT (add/add): Merge conflict in include/top_header.php Auto-merging include/top_header.php CONFLICT (add/add): Merge conflict in include/top_graph_header.php Auto-merging include/top_graph_header.php CONFLICT (add/add): Merge conflict in include/top_general_header.php Auto-merging include/top_general_header.php CONFLICT (add/add): Merge conflict in include/themes/sunrise/main.js Auto-merging include/themes/sunrise/main.js CONFLICT (add/add): Merge conflict in include/themes/sunrise/main.css Auto-merging include/themes/sunrise/main.css CONFLICT (add/add): Merge conflict in include/themes/raspberry/main.js Auto-merging include/themes/raspberry/main.js CONFLICT (add/add): Merge conflict in include/themes/paw/main.js Auto-merging include/themes/paw/main.js CONFLICT (add/add): Merge conflict in include/themes/paw/main.css Auto-merging include/themes/paw/main.css CONFLICT (add/add): Merge conflict in include/themes/paw/jquery.timepicker.css Auto-merging include/themes/paw/jquery.timepicker.css CONFLICT (add/add): Merge conflict in include/themes/paper-plane/main.js Auto-merging include/themes/paper-plane/main.js CONFLICT (add/add): Merge conflict in include/themes/paper-plane/main.css Auto-merging include/themes/paper-plane/main.css CONFLICT (add/add): Merge conflict in include/themes/paper-plane/billboard.css Auto-merging include/themes/paper-plane/billboard.css CONFLICT (add/add): Merge conflict in include/themes/modern/main.js Auto-merging include/themes/modern/main.js CONFLICT (add/add): Merge conflict in include/themes/modern/main.css Auto-merging include/themes/modern/main.css CONFLICT (add/add): Merge conflict in include/themes/midwinter/rrdtheme.php Auto-merging include/themes/midwinter/rrdtheme.php CONFLICT (add/add): Merge conflict in include/themes/midwinter/pace.css Auto-merging include/themes/midwinter/pace.css CONFLICT (add/add): Merge conflict in include/themes/midwinter/main.js Auto-merging include/themes/midwinter/main.js CONFLICT (add/add): Merge conflict in include/themes/midwinter/main.css Auto-merging include/themes/midwinter/main.css CONFLICT (add/add): Merge conflict in include/themes/midwinter/jquery.zoom.css Auto-merging include/themes/midwinter/jquery.zoom.css CONFLICT (add/add): Merge conflict in include/themes/hollyberry/main.js Auto-merging include/themes/hollyberry/main.js CONFLICT (add/add): Merge conflict in include/themes/dark/main.js Auto-merging include/themes/dark/main.js CONFLICT (add/add): Merge conflict in include/themes/dark/main.css Auto-merging include/themes/dark/main.css CONFLICT (add/add): Merge conflict in include/themes/classic/main.css Auto-merging include/themes/classic/main.css CONFLICT (add/add): Merge conflict in include/themes/carrot/main.js Auto-merging include/themes/carrot/main.js CONFLICT (add/add): Merge conflict in include/themes/cacti/main.js Auto-merging include/themes/cacti/main.js CONFLICT (add/add): Merge conflict in include/session.php Auto-merging include/session.php CONFLICT (add/add): Merge conflict in include/realtime.js Auto-merging include/realtime.js CONFLICT (add/add): Merge conflict in include/plugins.php Auto-merging include/plugins.php CONFLICT (add/add): Merge conflict in include/layout.js Auto-merging include/layout.js CONFLICT (add/add): Merge conflict in include/js/pace.js Auto-merging include/js/pace.js CONFLICT (add/add): Merge conflict in include/js/jstree.js Auto-merging include/js/jstree.js CONFLICT (add/add): Merge conflict in include/js/jquery.zoom.js Auto-merging include/js/jquery.zoom.js CONFLICT (add/add): Merge conflict in include/js/jquery.multiselect.js Auto-merging include/js/jquery.multiselect.js CONFLICT (add/add): Merge conflict in include/js/jquery.js Auto-merging include/js/jquery.js CONFLICT (add/add): Merge conflict in include/js/jquery.dropdown.js Auto-merging include/js/jquery.dropdown.js CONFLICT (add/add): Merge conflict in include/js/jquery-ui.js Auto-merging include/js/jquery-ui.js CONFLICT (add/add): Merge conflict in include/js/billboard.js Auto-merging include/js/billboard.js CONFLICT (add/add): Merge conflict in include/global_settings.php Auto-merging include/global_settings.php CONFLICT (add/add): Merge conflict in include/global_session.php Auto-merging include/global_session.php CONFLICT (add/add): Merge conflict in include/global_languages.php Auto-merging include/global_languages.php CONFLICT (add/add): Merge conflict in include/global_form.php Auto-merging include/global_form.php CONFLICT (add/add): Merge conflict in include/global_constants.php Auto-merging include/global_constants.php CONFLICT (add/add): Merge conflict in include/global_arrays.php Auto-merging include/global_arrays.php CONFLICT (add/add): Merge conflict in include/global.php Auto-merging include/global.php CONFLICT (add/add): Merge conflict in include/fa/css/all.css Auto-merging include/fa/css/all.css CONFLICT (add/add): Merge conflict in include/csrf.php Auto-merging include/csrf.php CONFLICT (add/add): Merge conflict in include/config.php.dist Auto-merging include/config.php.dist CONFLICT (add/add): Merge conflict in include/cli_check.php Auto-merging include/cli_check.php CONFLICT (add/add): Merge conflict in include/bottom_footer.php Auto-merging include/bottom_footer.php CONFLICT (add/add): Merge conflict in include/auth.php Auto-merging include/auth.php CONFLICT (add/add): Merge conflict in images/cacti_logo_new.gif Auto-merging images/cacti_logo_new.gif CONFLICT (add/add): Merge conflict in images/cacti_logo.gif Auto-merging images/cacti_logo.gif CONFLICT (add/add): Merge conflict in host_templates.php Auto-merging host_templates.php CONFLICT (add/add): Merge conflict in host.php Auto-merging host.php CONFLICT (add/add): Merge conflict in graphs_new.php Auto-merging graphs_new.php CONFLICT (add/add): Merge conflict in graphs_items.php Auto-merging graphs_items.php CONFLICT (add/add): Merge conflict in graphs.php Auto-merging graphs.php CONFLICT (add/add): Merge conflict in graph_xport.php Auto-merging graph_xport.php CONFLICT (add/add): Merge conflict in graph_view.php Auto-merging graph_view.php CONFLICT (add/add): Merge conflict in graph_templates_items.php Auto-merging graph_templates_items.php CONFLICT (add/add): Merge conflict in graph_templates_inputs.php Auto-merging graph_templates_inputs.php CONFLICT (add/add): Merge conflict in graph_templates.php Auto-merging graph_templates.php CONFLICT (add/add): Merge conflict in graph_realtime.php Auto-merging graph_realtime.php CONFLICT (add/add): Merge conflict in graph_json.php Auto-merging graph_json.php CONFLICT (add/add): Merge conflict in graph_image.php Auto-merging graph_image.php CONFLICT (add/add): Merge conflict in graph.php Auto-merging graph.php CONFLICT (add/add): Merge conflict in gprint_presets.php Auto-merging gprint_presets.php CONFLICT (add/add): Merge conflict in formats/cacti_monitor.format Auto-merging formats/cacti_monitor.format CONFLICT (add/add): Merge conflict in formats/cacti_group_dark.format Auto-merging formats/cacti_group_dark.format CONFLICT (add/add): Merge conflict in formats/cacti_group.format Auto-merging formats/cacti_group.format CONFLICT (add/add): Merge conflict in docs/index.php Auto-merging docs/index.php CONFLICT (add/add): Merge conflict in docs/audit_schema.sql Auto-merging docs/audit_schema.sql CONFLICT (add/add): Merge conflict in docs/README.md Auto-merging docs/README.md CONFLICT (add/add): Merge conflict in data_templates.php Auto-merging data_templates.php CONFLICT (add/add): Merge conflict in data_sources.php Auto-merging data_sources.php CONFLICT (add/add): Merge conflict in data_source_profiles.php Auto-merging data_source_profiles.php CONFLICT (add/add): Merge conflict in data_queries.php Auto-merging data_queries.php CONFLICT (add/add): Merge conflict in data_input.php Auto-merging data_input.php CONFLICT (add/add): Merge conflict in data_debug.php Auto-merging data_debug.php CONFLICT (add/add): Merge conflict in color_templates_items.php Auto-merging color_templates_items.php CONFLICT (add/add): Merge conflict in color_templates.php Auto-merging color_templates.php CONFLICT (add/add): Merge conflict in color.php Auto-merging color.php CONFLICT (add/add): Merge conflict in cmd_realtime.php Auto-merging cmd_realtime.php CONFLICT (add/add): Merge conflict in cmd.php Auto-merging cmd.php CONFLICT (add/add): Merge conflict in clog_user.php Auto-merging clog_user.php CONFLICT (add/add): Merge conflict in clog.php Auto-merging clog.php CONFLICT (add/add): Merge conflict in cli/version.php Auto-merging cli/version.php CONFLICT (add/add): Merge conflict in cli/upgrade_database.php Auto-merging cli/upgrade_database.php CONFLICT (add/add): Merge conflict in cli/structure_rra_paths.php Auto-merging cli/structure_rra_paths.php CONFLICT (add/add): Merge conflict in cli/sqltable_to_php.php Auto-merging cli/sqltable_to_php.php CONFLICT (add/add): Merge conflict in cli/splice_rrd.php Auto-merging cli/splice_rrd.php CONFLICT (add/add): Merge conflict in cli/show_perms.php Auto-merging cli/show_perms.php CONFLICT (add/add): Merge conflict in cli/rrdresize.php Auto-merging cli/rrdresize.php CONFLICT (add/add): Merge conflict in cli/repair_templates.php Auto-merging cli/repair_templates.php CONFLICT (add/add): Merge conflict in cli/repair_graphs.php Auto-merging cli/repair_graphs.php CONFLICT (add/add): Merge conflict in cli/repair_database.php Auto-merging cli/repair_database.php CONFLICT (add/add): Merge conflict in cli/reorder_data_query.php Auto-merging cli/reorder_data_query.php CONFLICT (add/add): Merge conflict in cli/removespikes.php Auto-merging cli/removespikes.php CONFLICT (add/add): Merge conflict in cli/remove_graphs.php Auto-merging cli/remove_graphs.php CONFLICT (add/add): Merge conflict in cli/remove_device.php Auto-merging cli/remove_device.php CONFLICT (add/add): Merge conflict in cli/refresh_csrf.php Auto-merging cli/refresh_csrf.php CONFLICT (add/add): Merge conflict in cli/rebuild_poller_cache.php Auto-merging cli/rebuild_poller_cache.php CONFLICT (add/add): Merge conflict in cli/poller_replicate.php Auto-merging cli/poller_replicate.php CONFLICT (add/add): Merge conflict in cli/poller_reindex_hosts.php Auto-merging cli/poller_reindex_hosts.php CONFLICT (add/add): Merge conflict in cli/poller_output_empty.php Auto-merging cli/poller_output_empty.php CONFLICT (add/add): Merge conflict in cli/poller_graphs_reapply_names.php Auto-merging cli/poller_graphs_reapply_names.php CONFLICT (add/add): Merge conflict in cli/poller_data_sources_reapply_names.php Auto-merging cli/poller_data_sources_reapply_names.php CONFLICT (add/add): Merge conflict in cli/md5sum.php Auto-merging cli/md5sum.php CONFLICT (add/add): Merge conflict in cli/install_cacti.php Auto-merging cli/install_cacti.php CONFLICT (add/add): Merge conflict in cli/input_whitelist.php Auto-merging cli/input_whitelist.php CONFLICT (add/add): Merge conflict in cli/import_template.php Auto-merging cli/import_template.php CONFLICT (add/add): Merge conflict in cli/import_package.php Auto-merging cli/import_package.php CONFLICT (add/add): Merge conflict in cli/host_update_template.php Auto-merging cli/host_update_template.php CONFLICT (add/add): Merge conflict in cli/fix_mediumint.php Auto-merging cli/fix_mediumint.php CONFLICT (add/add): Merge conflict in cli/copy_user.php Auto-merging cli/copy_user.php CONFLICT (add/add): Merge conflict in cli/convert_tables.php Auto-merging cli/convert_tables.php CONFLICT (add/add): Merge conflict in cli/change_device.php Auto-merging cli/change_device.php CONFLICT (add/add): Merge conflict in cli/audit_database.php Auto-merging cli/audit_database.php CONFLICT (add/add): Merge conflict in cli/apply_automation_rules.php Auto-merging cli/apply_automation_rules.php CONFLICT (add/add): Merge conflict in cli/analyze_database.php Auto-merging cli/analyze_database.php CONFLICT (add/add): Merge conflict in cli/add_tree.php Auto-merging cli/add_tree.php CONFLICT (add/add): Merge conflict in cli/add_site.php Auto-merging cli/add_site.php CONFLICT (add/add): Merge conflict in cli/add_perms.php Auto-merging cli/add_perms.php CONFLICT (add/add): Merge conflict in cli/add_graphs.php Auto-merging cli/add_graphs.php CONFLICT (add/add): Merge conflict in cli/add_graph_template.php Auto-merging cli/add_graph_template.php CONFLICT (add/add): Merge conflict in cli/add_device.php Auto-merging cli/add_device.php CONFLICT (add/add): Merge conflict in cli/add_datasource.php Auto-merging cli/add_datasource.php CONFLICT (add/add): Merge conflict in cli/add_data_query.php Auto-merging cli/add_data_query.php CONFLICT (add/add): Merge conflict in changelog.php Auto-merging changelog.php CONFLICT (add/add): Merge conflict in cdef.php Auto-merging cdef.php CONFLICT (add/add): Merge conflict in cactid.php Auto-merging cactid.php CONFLICT (add/add): Merge conflict in cacti.sql Auto-merging cacti.sql CONFLICT (add/add): Merge conflict in boost_rrdupdate.php Auto-merging boost_rrdupdate.php CONFLICT (add/add): Merge conflict in automation_tree_rules.php Auto-merging automation_tree_rules.php CONFLICT (add/add): Merge conflict in automation_templates.php Auto-merging automation_templates.php CONFLICT (add/add): Merge conflict in automation_snmp.php Auto-merging automation_snmp.php CONFLICT (add/add): Merge conflict in automation_networks.php Auto-merging automation_networks.php CONFLICT (add/add): Merge conflict in automation_graph_rules.php Auto-merging automation_graph_rules.php CONFLICT (add/add): Merge conflict in automation_devices.php Auto-merging automation_devices.php CONFLICT (add/add): Merge conflict in auth_profile.php Auto-merging auth_profile.php CONFLICT (add/add): Merge conflict in auth_login.php Auto-merging auth_login.php CONFLICT (add/add): Merge conflict in auth_changepassword.php Auto-merging auth_changepassword.php CONFLICT (add/add): Merge conflict in auth_2fa.php Auto-merging auth_2fa.php CONFLICT (add/add): Merge conflict in aggregate_templates.php Auto-merging aggregate_templates.php CONFLICT (add/add): Merge conflict in aggregate_items.php Auto-merging aggregate_items.php CONFLICT (add/add): Merge conflict in aggregate_graphs.php Auto-merging aggregate_graphs.php CONFLICT (add/add): Merge conflict in about.php Auto-merging about.php CONFLICT (add/add): Merge conflict in README.md Auto-merging README.md CONFLICT (add/add): Merge conflict in LICENSE Auto-merging LICENSE CONFLICT (add/add): Merge conflict in CHANGELOG Auto-merging CHANGELOG CONFLICT (add/add): Merge conflict in .travis.yml Auto-merging .travis.yml CONFLICT (add/add): Merge conflict in .gitignore Auto-merging .gitignore error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 Correct header shebang Resolve all conflicts manually, mark them as resolved with "git add/rm <conflicted_files>", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort". (1)a year ago
First, rewinding head to replay your work on top of it... Applying: Correct header shebang .git/rebase-apply/patch:4106: trailing whitespace. With that said, there are several changes that you MUST perform to MySQL/MariaDB .git/rebase-apply/patch:4160: trailing whitespace. do .git/rebase-apply/patch:4269: trailing whitespace. ### Check out the Cacti Group's Official YouTube channel .git/rebase-apply/patch:4425: trailing whitespace. If a vulnerability is reproducible with evidence, please .git/rebase-apply/patch:4426: trailing whitespace. contact us on [email protected]. We would appreciate warning: squelched 2355 whitespace errors warning: 2360 lines add whitespace errors. Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. msggrep: msggrep: warning: warning: Locale charset "ANSI_X3.4-1968" is different from Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". input file charset "UTF-8". Output of 'msggrep' might be incorrect. Output of 'msggrep' might be incorrect. Possible workarounds are: Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. then convert back to UTF-8 using 'msgconv'. msggrep: warning: Locale charset "ANSI_X3.4-1968" is different from input file charset "UTF-8". Output of 'msggrep' might be incorrect. Possible workarounds are: - Set LC_ALL to a locale with encoding UTF-8. - Convert the translation catalog to ASCII using 'msgconv', then apply 'msggrep', then convert back to UTF-8 using 'msgconv'. warning: Cannot merge binary files: locales/LC_MESSAGES/zh-TW.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/zh-CN.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/vi-VN.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/tr-TR.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/sv-SE.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/ru-RU.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/pt-PT.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/pt-BR.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/pl-PL.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/nl-NL.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/ko-KR.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/ja-JP.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/it-IT.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/hi-IN.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/he-IL.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/fr-FR.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/es-ES.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/el-GR.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/de-DE.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/bg-BG.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: locales/LC_MESSAGES/ar-SA.mo (HEAD vs. Correct header shebang) warning: Cannot merge binary files: install/templates/Windows_Device.xml.gz (HEAD vs. Correct header shebang) warning: Cannot merge binary files: install/templates/NetSNMP_Device.xml.gz (HEAD vs. Correct header shebang) warning: Cannot merge binary files: install/templates/Local_Linux_Machine.xml.gz (HEAD vs. Correct header shebang) warning: Cannot merge binary files: install/templates/Generic_SNMP_Device.xml.gz (HEAD vs. Correct header shebang) warning: Cannot merge binary files: install/templates/Cisco_Router.xml.gz (HEAD vs. Correct header shebang) warning: Cannot merge binary files: install/templates/Cacti_Stats.xml.gz (HEAD vs. Correct header shebang) warning: Cannot merge binary files: images/cacti_logo_new.gif (HEAD vs. Correct header shebang) warning: Cannot merge binary files: images/cacti_logo.gif (HEAD vs. Correct header shebang) CONFLICT (add/add): Merge conflict in vdef.php Auto-merging vdef.php CONFLICT (add/add): Merge conflict in utilities.php Auto-merging utilities.php CONFLICT (add/add): Merge conflict in user_group_admin.php Auto-merging user_group_admin.php CONFLICT (add/add): Merge conflict in user_domains.php Auto-merging user_domains.php CONFLICT (add/add): Merge conflict in user_admin.php Auto-merging user_admin.php CONFLICT (add/add): Merge conflict in tree.php Auto-merging tree.php CONFLICT (add/add): Merge conflict in tests/tools/check_install_code.php Auto-merging tests/tools/check_install_code.php CONFLICT (add/add): Merge conflict in tests/tools/check_cli_version.sh Auto-merging tests/tools/check_cli_version.sh CONFLICT (add/add): Merge conflict in tests/tools/check_all_pages.sh Auto-merging tests/tools/check_all_pages.sh CONFLICT (add/add): Merge conflict in tests/tools/cacti.conf Auto-merging tests/tools/cacti.conf CONFLICT (add/add): Merge conflict in templates_import.php Auto-merging templates_import.php CONFLICT (add/add): Merge conflict in templates_export.php Auto-merging templates_export.php CONFLICT (add/add): Merge conflict in support.php Auto-merging support.php CONFLICT (add/add): Merge conflict in spikekill.php Auto-merging spikekill.php CONFLICT (add/add): Merge conflict in snmpagent_persist.php Auto-merging snmpagent_persist.php CONFLICT (add/add): Merge conflict in snmpagent_mibcachechild.php Auto-merging snmpagent_mibcachechild.php CONFLICT (add/add): Merge conflict in snmpagent_mibcache.php Auto-merging snmpagent_mibcache.php CONFLICT (add/add): Merge conflict in sites.php Auto-merging sites.php CONFLICT (add/add): Merge conflict in settings.php Auto-merging settings.php CONFLICT (add/add): Merge conflict in service/README.md Auto-merging service/README.md CONFLICT (add/add): Merge conflict in scripts/weatherbug.pl Auto-merging scripts/weatherbug.pl CONFLICT (add/add): Merge conflict in scripts/ss_webseer.php Auto-merging scripts/ss_webseer.php CONFLICT (add/add): Merge conflict in scripts/ss_sql.php Auto-merging scripts/ss_sql.php CONFLICT (add/add): Merge conflict in scripts/ss_poller.php Auto-merging scripts/ss_poller.php CONFLICT (add/add): Merge conflict in scripts/ss_net_snmp_disk_io.php Auto-merging scripts/ss_net_snmp_disk_io.php CONFLICT (add/add): Merge conflict in scripts/ss_net_snmp_disk_bytes.php Auto-merging scripts/ss_net_snmp_disk_bytes.php CONFLICT (add/add): Merge conflict in scripts/ss_hstats.php Auto-merging scripts/ss_hstats.php CONFLICT (add/add): Merge conflict in scripts/ss_host_disk.php Auto-merging scripts/ss_host_disk.php CONFLICT (add/add): Merge conflict in scripts/ss_host_cpu.php Auto-merging scripts/ss_host_cpu.php CONFLICT (add/add): Merge conflict in scripts/ss_gexport.php Auto-merging scripts/ss_gexport.php CONFLICT (add/add): Merge conflict in scripts/ss_fping.php Auto-merging scripts/ss_fping.php CONFLICT (add/add): Merge conflict in scripts/ss_cpoller.php Auto-merging scripts/ss_cpoller.php CONFLICT (add/add): Merge conflict in scripts/ss_count_oids.php Auto-merging scripts/ss_count_oids.php CONFLICT (add/add): Merge conflict in scripts/cacti_user_stats.php Auto-merging scripts/cacti_user_stats.php CONFLICT (add/add): Merge conflict in script_server.php Auto-merging script_server.php CONFLICT (add/add): Merge conflict in rrdcleaner.php Auto-merging rrdcleaner.php CONFLICT (add/add): Merge conflict in resource/snmp_queries/interface.xml Auto-merging resource/snmp_queries/interface.xml CONFLICT (add/add): Merge conflict in resource/script_server/webseer.xml Auto-merging resource/script_server/webseer.xml CONFLICT (add/add): Merge conflict in resource/script_server/host_disk.xml Auto-merging resource/script_server/host_disk.xml CONFLICT (add/add): Merge conflict in resource/script_server/host_cpu.xml Auto-merging resource/script_server/host_cpu.xml CONFLICT (add/add): Merge conflict in resource/script_server/gexport.xml Auto-merging resource/script_server/gexport.xml CONFLICT (add/add): Merge conflict in resource/script_server/cpoller.xml Auto-merging resource/script_server/cpoller.xml CONFLICT (add/add): Merge conflict in resource/script_queries/unix_disk.xml Auto-merging resource/script_queries/unix_disk.xml CONFLICT (add/add): Merge conflict in resource/script_queries/host_disk.xml Auto-merging resource/script_queries/host_disk.xml CONFLICT (add/add): Merge conflict in resource/script_queries/host_cpu.xml Auto-merging resource/script_queries/host_cpu.xml CONFLICT (add/add): Merge conflict in reports_user.php Auto-merging reports_user.php CONFLICT (add/add): Merge conflict in reports_admin.php Auto-merging reports_admin.php CONFLICT (add/add): Merge conflict in remote_agent.php Auto-merging remote_agent.php CONFLICT (add/add): Merge conflict in pollers.php Auto-merging pollers.php CONFLICT (add/add): Merge conflict in poller_spikekill.php Auto-merging poller_spikekill.php CONFLICT (add/add): Merge conflict in poller_reports.php Auto-merging poller_reports.php CONFLICT (add/add): Merge conflict in poller_recovery.php Auto-merging poller_recovery.php CONFLICT (add/add): Merge conflict in poller_realtime.php Auto-merging poller_realtime.php CONFLICT (add/add): Merge conflict in poller_maintenance.php Auto-merging poller_maintenance.php CONFLICT (add/add): Merge conflict in poller_dsstats.php Auto-merging poller_dsstats.php CONFLICT (add/add): Merge conflict in poller_commands.php Auto-merging poller_commands.php CONFLICT (add/add): Merge conflict in poller_boost.php Auto-merging poller_boost.php CONFLICT (add/add): Merge conflict in poller_automation.php Auto-merging poller_automation.php CONFLICT (add/add): Merge conflict in poller.php Auto-merging poller.php CONFLICT (add/add): Merge conflict in plugins.php Auto-merging plugins.php CONFLICT (add/add): Merge conflict in permission_denied.php Auto-merging permission_denied.php CONFLICT (add/add): Merge conflict in mibs/CACTI-SNMPAGENT-MIB Auto-merging mibs/CACTI-SNMPAGENT-MIB CONFLICT (add/add): Merge conflict in mibs/CACTI-MIB Auto-merging mibs/CACTI-MIB CONFLICT (add/add): Merge conflict in mibs/CACTI-BOOST-MIB Auto-merging mibs/CACTI-BOOST-MIB CONFLICT (add/add): Merge conflict in managers.php Auto-merging managers.php CONFLICT (add/add): Merge conflict in logout.php Auto-merging logout.php CONFLICT (add/add): Merge conflict in locales/po/zh-TW.po Auto-merging locales/po/zh-TW.po CONFLICT (add/add): Merge conflict in locales/po/zh-CN.po Auto-merging locales/po/zh-CN.po CONFLICT (add/add): Merge conflict in locales/po/vi-VN.po Auto-merging locales/po/vi-VN.po CONFLICT (add/add): Merge conflict in locales/po/tr-TR.po Auto-merging locales/po/tr-TR.po CONFLICT (add/add): Merge conflict in locales/po/sv-SE.po Auto-merging locales/po/sv-SE.po CONFLICT (add/add): Merge conflict in locales/po/ru-RU.po Auto-merging locales/po/ru-RU.po CONFLICT (add/add): Merge conflict in locales/po/pt-PT.po Auto-merging locales/po/pt-PT.po CONFLICT (add/add): Merge conflict in locales/po/pt-BR.po Auto-merging locales/po/pt-BR.po CONFLICT (add/add): Merge conflict in locales/po/pl-PL.po Auto-merging locales/po/pl-PL.po CONFLICT (add/add): Merge conflict in locales/po/nl-NL.po Auto-merging locales/po/nl-NL.po CONFLICT (add/add): Merge conflict in locales/po/ko-KR.po Auto-merging locales/po/ko-KR.po CONFLICT (add/add): Merge conflict in locales/po/ja-JP.po Auto-merging locales/po/ja-JP.po CONFLICT (add/add): Merge conflict in locales/po/it-IT.po Auto-merging locales/po/it-IT.po CONFLICT (add/add): Merge conflict in locales/po/hi-IN.po Auto-merging locales/po/hi-IN.po CONFLICT (add/add): Merge conflict in locales/po/he-IL.po Auto-merging locales/po/he-IL.po CONFLICT (add/add): Merge conflict in locales/po/fr-FR.po Auto-merging locales/po/fr-FR.po CONFLICT (add/add): Merge conflict in locales/po/es-ES.po Auto-merging locales/po/es-ES.po CONFLICT (add/add): Merge conflict in locales/po/el-GR.po Auto-merging locales/po/el-GR.po CONFLICT (add/add): Merge conflict in locales/po/de-DE.po Auto-merging locales/po/de-DE.po CONFLICT (add/add): Merge conflict in locales/po/cacti.pot Auto-merging locales/po/cacti.pot CONFLICT (add/add): Merge conflict in locales/po/bg-BG.po Auto-merging locales/po/bg-BG.po CONFLICT (add/add): Merge conflict in locales/po/ar-SA.po Auto-merging locales/po/ar-SA.po CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/zh-TW.mo Auto-merging locales/LC_MESSAGES/zh-TW.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/zh-CN.mo Auto-merging locales/LC_MESSAGES/zh-CN.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/vi-VN.mo Auto-merging locales/LC_MESSAGES/vi-VN.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/tr-TR.mo Auto-merging locales/LC_MESSAGES/tr-TR.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/sv-SE.mo Auto-merging locales/LC_MESSAGES/sv-SE.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/ru-RU.mo Auto-merging locales/LC_MESSAGES/ru-RU.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/pt-PT.mo Auto-merging locales/LC_MESSAGES/pt-PT.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/pt-BR.mo Auto-merging locales/LC_MESSAGES/pt-BR.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/pl-PL.mo Auto-merging locales/LC_MESSAGES/pl-PL.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/nl-NL.mo Auto-merging locales/LC_MESSAGES/nl-NL.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/ko-KR.mo Auto-merging locales/LC_MESSAGES/ko-KR.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/ja-JP.mo Auto-merging locales/LC_MESSAGES/ja-JP.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/it-IT.mo Auto-merging locales/LC_MESSAGES/it-IT.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/hi-IN.mo Auto-merging locales/LC_MESSAGES/hi-IN.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/he-IL.mo Auto-merging locales/LC_MESSAGES/he-IL.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/fr-FR.mo Auto-merging locales/LC_MESSAGES/fr-FR.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/es-ES.mo Auto-merging locales/LC_MESSAGES/es-ES.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/el-GR.mo Auto-merging locales/LC_MESSAGES/el-GR.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/de-DE.mo Auto-merging locales/LC_MESSAGES/de-DE.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/bg-BG.mo Auto-merging locales/LC_MESSAGES/bg-BG.mo CONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/ar-SA.mo Auto-merging locales/LC_MESSAGES/ar-SA.mo CONFLICT (add/add): Merge conflict in links.php Auto-merging links.php CONFLICT (add/add): Merge conflict in link.php Auto-merging link.php CONFLICT (add/add): Merge conflict in lib/xml.php Auto-merging lib/xml.php CONFLICT (add/add): Merge conflict in lib/vdef.php Auto-merging lib/vdef.php CONFLICT (add/add): Merge conflict in lib/variables.php Auto-merging lib/variables.php CONFLICT (add/add): Merge conflict in lib/utility.php Auto-merging lib/utility.php CONFLICT (add/add): Merge conflict in lib/timespan_settings.php Auto-merging lib/timespan_settings.php CONFLICT (add/add): Merge conflict in lib/time.php Auto-merging lib/time.php CONFLICT (add/add): Merge conflict in lib/template.php Auto-merging lib/template.php CONFLICT (add/add): Merge conflict in lib/spikekill.php Auto-merging lib/spikekill.php CONFLICT (add/add): Merge conflict in lib/sort.php Auto-merging lib/sort.php CONFLICT (add/add): Merge conflict in lib/snmpagent.php Auto-merging lib/snmpagent.php CONFLICT (add/add): Merge conflict in lib/snmp.php Auto-merging lib/snmp.php CONFLICT (add/add): Merge conflict in lib/rrd.php Auto-merging lib/rrd.php CONFLICT (add/add): Merge conflict in lib/reports.php Auto-merging lib/reports.php CONFLICT (add/add): Merge conflict in lib/poller.php Auto-merging lib/poller.php CONFLICT (add/add): Merge conflict in lib/plugins.php Auto-merging lib/plugins.php CONFLICT (add/add): Merge conflict in lib/ping.php Auto-merging lib/ping.php CONFLICT (add/add): Merge conflict in lib/mib_cache.php Auto-merging lib/mib_cache.php CONFLICT (add/add): Merge conflict in lib/ldap.php Auto-merging lib/ldap.php CONFLICT (add/add): Merge conflict in lib/installer.php Auto-merging lib/installer.php CONFLICT (add/add): Merge conflict in lib/import.php Auto-merging lib/import.php CONFLICT (add/add): Merge conflict in lib/html_validate.php Auto-merging lib/html_validate.php CONFLICT (add/add): Merge conflict in lib/html_utility.php Auto-merging lib/html_utility.php CONFLICT (add/add): Merge conflict in lib/html_tree.php Auto-merging lib/html_tree.php CONFLICT (add/add): Merge conflict in lib/html_reports.php Auto-merging lib/html_reports.php CONFLICT (add/add): Merge conflict in lib/html_graph.php Auto-merging lib/html_graph.php CONFLICT (add/add): Merge conflict in lib/html_form_template.php Auto-merging lib/html_form_template.php CONFLICT (add/add): Merge conflict in lib/html_form.php Auto-merging lib/html_form.php CONFLICT (add/add): Merge conflict in lib/html_filter.php Auto-merging lib/html_filter.php CONFLICT (add/add): Merge conflict in lib/html.php Auto-merging lib/html.php CONFLICT (add/add): Merge conflict in lib/graphs.php Auto-merging lib/graphs.php CONFLICT (add/add): Merge conflict in lib/graph_variables.php Auto-merging lib/graph_variables.php CONFLICT (add/add): Merge conflict in lib/functions.php Auto-merging lib/functions.php CONFLICT (add/add): Merge conflict in lib/export.php Auto-merging lib/export.php CONFLICT (add/add): Merge conflict in lib/dsstats.php Auto-merging lib/dsstats.php CONFLICT (add/add): Merge conflict in lib/dsdebug.php Auto-merging lib/dsdebug.php CONFLICT (add/add): Merge conflict in lib/database.php Auto-merging lib/database.php CONFLICT (add/add): Merge conflict in lib/data_query.php Auto-merging lib/data_query.php CONFLICT (add/add): Merge conflict in lib/clog_webapi.php Auto-merging lib/clog_webapi.php CONFLICT (add/add): Merge conflict in lib/cdef.php Auto-merging lib/cdef.php CONFLICT (add/add): Merge conflict in lib/boost.php Auto-merging lib/boost.php CONFLICT (add/add): Merge conflict in lib/auth.php Auto-merging lib/auth.php CONFLICT (add/add): Merge conflict in lib/api_tree.php Auto-merging lib/api_tree.php CONFLICT (add/add): Merge conflict in lib/api_poller.php Auto-merging lib/api_poller.php CONFLICT (add/add): Merge conflict in lib/api_graph.php Auto-merging lib/api_graph.php CONFLICT (add/add): Merge conflict in lib/api_device.php Auto-merging lib/api_device.php CONFLICT (add/add): Merge conflict in lib/api_data_source.php Auto-merging lib/api_data_source.php CONFLICT (add/add): Merge conflict in lib/api_automation_tools.php Auto-merging lib/api_automation_tools.php CONFLICT (add/add): Merge conflict in lib/api_automation.php Auto-merging lib/api_automation.php CONFLICT (add/add): Merge conflict in lib/api_aggregate.php Auto-merging lib/api_aggregate.php CONFLICT (add/add): Merge conflict in lib/aggregate.php Auto-merging lib/aggregate.php CONFLICT (add/add): Merge conflict in install/upgrades/1_3_0.php Auto-merging install/upgrades/1_3_0.php CONFLICT (add/add): Merge conflict in install/upgrades/1_2_8.php Auto-merging install/upgrades/1_2_8.php CONFLICT (add/add): Merge conflict in install/upgrades/1_2_7.php Auto-merging install/upgrades/1_2_7.php CONFLICT (add/add): Merge conflict in install/upgrades/1_2_5.php Auto-merging install/upgrades/1_2_5.php CONFLICT (add/add): Merge conflict in install/upgrades/1_2_3.php Auto-merging install/upgrades/1_2_3.php CONFLICT (add/add): Merge conflict in install/upgrades/1_2_2.php Auto-merging install/upgrades/1_2_2.php CONFLICT (add/add): Merge conflict in install/upgrades/1_2_17.php Auto-merging install/upgrades/1_2_17.php CONFLICT (add/add): Merge conflict in install/upgrades/1_2_15.php Auto-merging install/upgrades/1_2_15.php CONFLICT (add/add): Merge conflict in install/upgrades/1_2_14.php Auto-merging install/upgrades/1_2_14.php CONFLICT (add/add): Merge conflict in install/upgrades/1_2_11.php Auto-merging install/upgrades/1_2_11.php CONFLICT (add/add): Merge conflict in install/upgrades/1_2_1.php Auto-merging install/upgrades/1_2_1.php CONFLICT (add/add): Merge conflict in install/upgrades/1_2_0.php Auto-merging install/upgrades/1_2_0.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_8.php Auto-merging install/upgrades/1_1_8.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_7.php Auto-merging install/upgrades/1_1_7.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_6.php Auto-merging install/upgrades/1_1_6.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_4.php Auto-merging install/upgrades/1_1_4.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_37.php Auto-merging install/upgrades/1_1_37.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_36.php Auto-merging install/upgrades/1_1_36.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_35.php Auto-merging install/upgrades/1_1_35.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_34.php Auto-merging install/upgrades/1_1_34.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_31.php Auto-merging install/upgrades/1_1_31.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_28.php Auto-merging install/upgrades/1_1_28.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_26.php Auto-merging install/upgrades/1_1_26.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_20.php Auto-merging install/upgrades/1_1_20.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_2.php Auto-merging install/upgrades/1_1_2.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_17.php Auto-merging install/upgrades/1_1_17.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_14.php Auto-merging install/upgrades/1_1_14.php CONFLICT (add/add): Merge conflict in install/upgrades/1_1_11.php Auto-merging install/upgrades/1_1_11.php CONFLICT (add/add): Merge conflict in install/upgrades/1_0_5.php Auto-merging install/upgrades/1_0_5.php CONFLICT (add/add): Merge conflict in install/upgrades/1_0_4.php Auto-merging install/upgrades/1_0_4.php CONFLICT (add/add): Merge conflict in install/upgrades/1_0_0.php Auto-merging install/upgrades/1_0_0.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_8.php Auto-merging install/upgrades/0_8_8.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_7h.php Auto-merging install/upgrades/0_8_7h.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_7c.php Auto-merging install/upgrades/0_8_7c.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_7b.php Auto-merging install/upgrades/0_8_7b.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_7a.php Auto-merging install/upgrades/0_8_7a.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_7.php Auto-merging install/upgrades/0_8_7.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_6i.php Auto-merging install/upgrades/0_8_6i.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_6h.php Auto-merging install/upgrades/0_8_6h.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_6g.php Auto-merging install/upgrades/0_8_6g.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_6e.php Auto-merging install/upgrades/0_8_6e.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_6d.php Auto-merging install/upgrades/0_8_6d.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_6a.php Auto-merging install/upgrades/0_8_6a.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_6.php Auto-merging install/upgrades/0_8_6.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_5.php Auto-merging install/upgrades/0_8_5.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_4.php Auto-merging install/upgrades/0_8_4.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_3.php Auto-merging install/upgrades/0_8_3.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_2a.php Auto-merging install/upgrades/0_8_2a.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_2.php Auto-merging install/upgrades/0_8_2.php CONFLICT (add/add): Merge conflict in install/upgrades/0_8_1.php Auto-merging install/upgrades/0_8_1.php CONFLICT (add/add): Merge conflict in install/templates/Windows_Device.xml.gz Auto-merging install/templates/Windows_Device.xml.gz CONFLICT (add/add): Merge conflict in install/templates/NetSNMP_Device.xml.gz Auto-merging install/templates/NetSNMP_Device.xml.gz CONFLICT (add/add): Merge conflict in install/templates/Local_Linux_Machine.xml.gz Auto-merging install/templates/Local_Linux_Machine.xml.gz CONFLICT (add/add): Merge conflict in install/templates/Generic_SNMP_Device.xml.gz Auto-merging install/templates/Generic_SNMP_Device.xml.gz CONFLICT (add/add): Merge conflict in install/templates/Cisco_Router.xml.gz Auto-merging install/templates/Cisco_Router.xml.gz CONFLICT (add/add): Merge conflict in install/templates/Cacti_Stats.xml.gz Auto-merging install/templates/Cacti_Stats.xml.gz CONFLICT (add/add): Merge conflict in install/step_json.php Auto-merging install/step_json.php CONFLICT (add/add): Merge conflict in install/install.php Auto-merging install/install.php CONFLICT (add/add): Merge conflict in install/install.js Auto-merging install/install.js CONFLICT (add/add): Merge conflict in install/install.css Auto-merging install/install.css CONFLICT (add/add): Merge conflict in install/index.php Auto-merging install/index.php CONFLICT (add/add): Merge conflict in install/functions.php Auto-merging install/functions.php CONFLICT (add/add): Merge conflict in install/cli_test.php Auto-merging install/cli_test.php CONFLICT (add/add): Merge conflict in install/cli_check.php Auto-merging install/cli_check.php CONFLICT (add/add): Merge conflict in install/background.php Auto-merging install/background.php CONFLICT (add/add): Merge conflict in index.php Auto-merging index.php CONFLICT (add/add): Merge conflict in include/vendor/phpsnmp/mib_parser.php Auto-merging include/vendor/phpsnmp/mib_parser.php CONFLICT (add/add): Merge conflict in include/vendor/phpsnmp/extension.php Auto-merging include/vendor/phpsnmp/extension.php CONFLICT (add/add): Merge conflict in include/vendor/phpsnmp/classSNMP.php Auto-merging include/vendor/phpsnmp/classSNMP.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/bootstrap.php Auto-merging include/vendor/phpseclib/bootstrap.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/System/SSH/Agent.php Auto-merging include/vendor/phpseclib/System/SSH/Agent.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/Net/SSH2.php Auto-merging include/vendor/phpseclib/Net/SSH2.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/Net/SFTP.php Auto-merging include/vendor/phpseclib/Net/SFTP.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/Math/BigInteger.php Auto-merging include/vendor/phpseclib/Math/BigInteger.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/File/X509.php Auto-merging include/vendor/phpseclib/File/X509.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/File/ASN1.php Auto-merging include/vendor/phpseclib/File/ASN1.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/Crypt/Twofish.php Auto-merging include/vendor/phpseclib/Crypt/Twofish.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/Crypt/Rijndael.php Auto-merging include/vendor/phpseclib/Crypt/Rijndael.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/Crypt/RSA.php Auto-merging include/vendor/phpseclib/Crypt/RSA.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/Crypt/RC2.php Auto-merging include/vendor/phpseclib/Crypt/RC2.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/Crypt/DES.php Auto-merging include/vendor/phpseclib/Crypt/DES.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/Crypt/Blowfish.php Auto-merging include/vendor/phpseclib/Crypt/Blowfish.php CONFLICT (add/add): Merge conflict in include/vendor/phpseclib/Crypt/Base.php Auto-merging include/vendor/phpseclib/Crypt/Base.php CONFLICT (add/add): Merge conflict in include/vendor/gettext/tests/TranslatorTest.php Auto-merging include/vendor/gettext/tests/TranslatorTest.php CONFLICT (add/add): Merge conflict in include/vendor/gettext/src/translator_functions.php Auto-merging include/vendor/gettext/src/translator_functions.php CONFLICT (add/add): Merge conflict in include/vendor/gettext/CONTRIBUTING.md Auto-merging include/vendor/gettext/CONTRIBUTING.md CONFLICT (add/add): Merge conflict in include/vendor/csrf/csrf-conf.php Auto-merging include/vendor/csrf/csrf-conf.php CONFLICT (add/add): Merge conflict in include/vendor/cldr-to-gettext-plural-rules/bin/export-plural-rules Auto-merging include/vendor/cldr-to-gettext-plural-rules/bin/export-plural-rules CONFLICT (add/add): Merge conflict in include/vendor/GoogleAuthenticator/RuntimeException.php Auto-merging include/vendor/GoogleAuthenticator/RuntimeException.php CONFLICT (add/add): Merge conflict in include/vendor/GoogleAuthenticator/GoogleQrUrl.php Auto-merging include/vendor/GoogleAuthenticator/GoogleQrUrl.php CONFLICT (add/add): Merge conflict in include/vendor/GoogleAuthenticator/GoogleAuthenticatorInterface.php Auto-merging include/vendor/GoogleAuthenticator/GoogleAuthenticatorInterface.php CONFLICT (add/add): Merge conflict in include/vendor/GoogleAuthenticator/GoogleAuthenticator.php Auto-merging include/vendor/GoogleAuthenticator/GoogleAuthenticator.php CONFLICT (add/add): Merge conflict in include/vendor/GoogleAuthenticator/FixedBitNotation.php Auto-merging include/vendor/GoogleAuthenticator/FixedBitNotation.php CONFLICT (add/add): Merge conflict in include/top_header.php Auto-merging include/top_header.php CONFLICT (add/add): Merge conflict in include/top_graph_header.php Auto-merging include/top_graph_header.php CONFLICT (add/add): Merge conflict in include/top_general_header.php Auto-merging include/top_general_header.php CONFLICT (add/add): Merge conflict in include/themes/sunrise/main.js Auto-merging include/themes/sunrise/main.js CONFLICT (add/add): Merge conflict in include/themes/sunrise/main.css Auto-merging include/themes/sunrise/main.css CONFLICT (add/add): Merge conflict in include/themes/raspberry/main.js Auto-merging include/themes/raspberry/main.js CONFLICT (add/add): Merge conflict in include/themes/paw/main.js Auto-merging include/themes/paw/main.js CONFLICT (add/add): Merge conflict in include/themes/paw/main.css Auto-merging include/themes/paw/main.css CONFLICT (add/add): Merge conflict in include/themes/paw/jquery.timepicker.css Auto-merging include/themes/paw/jquery.timepicker.css CONFLICT (add/add): Merge conflict in include/themes/paper-plane/main.js Auto-merging include/themes/paper-plane/main.js CONFLICT (add/add): Merge conflict in include/themes/paper-plane/main.css Auto-merging include/themes/paper-plane/main.css CONFLICT (add/add): Merge conflict in include/themes/paper-plane/billboard.css Auto-merging include/themes/paper-plane/billboard.css CONFLICT (add/add): Merge conflict in include/themes/modern/main.js Auto-merging include/themes/modern/main.js CONFLICT (add/add): Merge conflict in include/themes/modern/main.css Auto-merging include/themes/modern/main.css CONFLICT (add/add): Merge conflict in include/themes/midwinter/rrdtheme.php Auto-merging include/themes/midwinter/rrdtheme.php CONFLICT (add/add): Merge conflict in include/themes/midwinter/pace.css Auto-merging include/themes/midwinter/pace.css CONFLICT (add/add): Merge conflict in include/themes/midwinter/main.js Auto-merging include/themes/midwinter/main.js CONFLICT (add/add): Merge conflict in include/themes/midwinter/main.css Auto-merging include/themes/midwinter/main.css CONFLICT (add/add): Merge conflict in include/themes/midwinter/jquery.zoom.css Auto-merging include/themes/midwinter/jquery.zoom.css CONFLICT (add/add): Merge conflict in include/themes/hollyberry/main.js Auto-merging include/themes/hollyberry/main.js CONFLICT (add/add): Merge conflict in include/themes/dark/main.js Auto-merging include/themes/dark/main.js CONFLICT (add/add): Merge conflict in include/themes/dark/main.css Auto-merging include/themes/dark/main.css CONFLICT (add/add): Merge conflict in include/themes/classic/main.css Auto-merging include/themes/classic/main.css CONFLICT (add/add): Merge conflict in include/themes/carrot/main.js Auto-merging include/themes/carrot/main.js CONFLICT (add/add): Merge conflict in include/themes/cacti/main.js Auto-merging include/themes/cacti/main.js CONFLICT (add/add): Merge conflict in include/session.php Auto-merging include/session.php CONFLICT (add/add): Merge conflict in include/realtime.js Auto-merging include/realtime.js CONFLICT (add/add): Merge conflict in include/plugins.php Auto-merging include/plugins.php CONFLICT (add/add): Merge conflict in include/layout.js Auto-merging include/layout.js CONFLICT (add/add): Merge conflict in include/js/pace.js Auto-merging include/js/pace.js CONFLICT (add/add): Merge conflict in include/js/jstree.js Auto-merging include/js/jstree.js CONFLICT (add/add): Merge conflict in include/js/jquery.zoom.js Auto-merging include/js/jquery.zoom.js CONFLICT (add/add): Merge conflict in include/js/jquery.multiselect.js Auto-merging include/js/jquery.multiselect.js CONFLICT (add/add): Merge conflict in include/js/jquery.js Auto-merging include/js/jquery.js CONFLICT (add/add): Merge conflict in include/js/jquery.dropdown.js Auto-merging include/js/jquery.dropdown.js CONFLICT (add/add): Merge conflict in include/js/jquery-ui.js Auto-merging include/js/jquery-ui.js CONFLICT (add/add): Merge conflict in include/js/billboard.js Auto-merging include/js/billboard.js CONFLICT (add/add): Merge conflict in include/global_settings.php Auto-merging include/global_settings.php CONFLICT (add/add): Merge conflict in include/global_session.php Auto-merging include/global_session.php CONFLICT (add/add): Merge conflict in include/global_languages.php Auto-merging include/global_languages.php CONFLICT (add/add): Merge conflict in include/global_form.php Auto-merging include/global_form.php CONFLICT (add/add): Merge conflict in include/global_constants.php Auto-merging include/global_constants.php CONFLICT (add/add): Merge conflict in include/global_arrays.php Auto-merging include/global_arrays.php CONFLICT (add/add): Merge conflict in include/global.php Auto-merging include/global.php CONFLICT (add/add): Merge conflict in include/fa/css/all.css Auto-merging include/fa/css/all.css CONFLICT (add/add): Merge conflict in include/csrf.php Auto-merging include/csrf.php CONFLICT (add/add): Merge conflict in include/config.php.dist Auto-merging include/config.php.dist CONFLICT (add/add): Merge conflict in include/cli_check.php Auto-merging include/cli_check.php CONFLICT (add/add): Merge conflict in include/bottom_footer.php Auto-merging include/bottom_footer.php CONFLICT (add/add): Merge conflict in include/auth.php Auto-merging include/auth.php CONFLICT (add/add): Merge conflict in images/cacti_logo_new.gif Auto-merging images/cacti_logo_new.gif CONFLICT (add/add): Merge conflict in images/cacti_logo.gif Auto-merging images/cacti_logo.gif CONFLICT (add/add): Merge conflict in host_templates.php Auto-merging host_templates.php CONFLICT (add/add): Merge conflict in host.php Auto-merging host.php CONFLICT (add/add): Merge conflict in graphs_new.php Auto-merging graphs_new.php CONFLICT (add/add): Merge conflict in graphs_items.php Auto-merging graphs_items.php CONFLICT (add/add): Merge conflict in graphs.php Auto-merging graphs.php CONFLICT (add/add): Merge conflict in graph_xport.php Auto-merging graph_xport.php CONFLICT (add/add): Merge conflict in graph_view.php Auto-merging graph_view.php CONFLICT (add/add): Merge conflict in graph_templates_items.php Auto-merging graph_templates_items.php CONFLICT (add/add): Merge conflict in graph_templates_inputs.php Auto-merging graph_templates_inputs.php CONFLICT (add/add): Merge conflict in graph_templates.php Auto-merging graph_templates.php CONFLICT (add/add): Merge conflict in graph_realtime.php Auto-merging graph_realtime.php CONFLICT (add/add): Merge conflict in graph_json.php Auto-merging graph_json.php CONFLICT (add/add): Merge conflict in graph_image.php Auto-merging graph_image.php CONFLICT (add/add): Merge conflict in graph.php Auto-merging graph.php CONFLICT (add/add): Merge conflict in gprint_presets.php Auto-merging gprint_presets.php CONFLICT (add/add): Merge conflict in formats/cacti_monitor.format Auto-merging formats/cacti_monitor.format CONFLICT (add/add): Merge conflict in formats/cacti_group_dark.format Auto-merging formats/cacti_group_dark.format CONFLICT (add/add): Merge conflict in formats/cacti_group.format Auto-merging formats/cacti_group.format CONFLICT (add/add): Merge conflict in docs/index.php Auto-merging docs/index.php CONFLICT (add/add): Merge conflict in docs/audit_schema.sql Auto-merging docs/audit_schema.sql CONFLICT (add/add): Merge conflict in docs/README.md Auto-merging docs/README.md CONFLICT (add/add): Merge conflict in data_templates.php Auto-merging data_templates.php CONFLICT (add/add): Merge conflict in data_sources.php Auto-merging data_sources.php CONFLICT (add/add): Merge conflict in data_source_profiles.php Auto-merging data_source_profiles.php CONFLICT (add/add): Merge conflict in data_queries.php Auto-merging data_queries.php CONFLICT (add/add): Merge conflict in data_input.php Auto-merging data_input.php CONFLICT (add/add): Merge conflict in data_debug.php Auto-merging data_debug.php CONFLICT (add/add): Merge conflict in color_templates_items.php Auto-merging color_templates_items.php CONFLICT (add/add): Merge conflict in color_templates.php Auto-merging color_templates.php CONFLICT (add/add): Merge conflict in color.php Auto-merging color.php CONFLICT (add/add): Merge conflict in cmd_realtime.php Auto-merging cmd_realtime.php CONFLICT (add/add): Merge conflict in cmd.php Auto-merging cmd.php CONFLICT (add/add): Merge conflict in clog_user.php Auto-merging clog_user.php CONFLICT (add/add): Merge conflict in clog.php Auto-merging clog.php CONFLICT (add/add): Merge conflict in cli/version.php Auto-merging cli/version.php CONFLICT (add/add): Merge conflict in cli/upgrade_database.php Auto-merging cli/upgrade_database.php CONFLICT (add/add): Merge conflict in cli/structure_rra_paths.php Auto-merging cli/structure_rra_paths.php CONFLICT (add/add): Merge conflict in cli/sqltable_to_php.php Auto-merging cli/sqltable_to_php.php CONFLICT (add/add): Merge conflict in cli/splice_rrd.php Auto-merging cli/splice_rrd.php CONFLICT (add/add): Merge conflict in cli/show_perms.php Auto-merging cli/show_perms.php CONFLICT (add/add): Merge conflict in cli/rrdresize.php Auto-merging cli/rrdresize.php CONFLICT (add/add): Merge conflict in cli/repair_templates.php Auto-merging cli/repair_templates.php CONFLICT (add/add): Merge conflict in cli/repair_graphs.php Auto-merging cli/repair_graphs.php CONFLICT (add/add): Merge conflict in cli/repair_database.php Auto-merging cli/repair_database.php CONFLICT (add/add): Merge conflict in cli/reorder_data_query.php Auto-merging cli/reorder_data_query.php CONFLICT (add/add): Merge conflict in cli/removespikes.php Auto-merging cli/removespikes.php CONFLICT (add/add): Merge conflict in cli/remove_graphs.php Auto-merging cli/remove_graphs.php CONFLICT (add/add): Merge conflict in cli/remove_device.php Auto-merging cli/remove_device.php CONFLICT (add/add): Merge conflict in cli/refresh_csrf.php Auto-merging cli/refresh_csrf.php CONFLICT (add/add): Merge conflict in cli/rebuild_poller_cache.php Auto-merging cli/rebuild_poller_cache.php CONFLICT (add/add): Merge conflict in cli/poller_replicate.php Auto-merging cli/poller_replicate.php CONFLICT (add/add): Merge conflict in cli/poller_reindex_hosts.php Auto-merging cli/poller_reindex_hosts.php CONFLICT (add/add): Merge conflict in cli/poller_output_empty.php Auto-merging cli/poller_output_empty.php CONFLICT (add/add): Merge conflict in cli/poller_graphs_reapply_names.php Auto-merging cli/poller_graphs_reapply_names.php CONFLICT (add/add): Merge conflict in cli/poller_data_sources_reapply_names.php Auto-merging cli/poller_data_sources_reapply_names.php CONFLICT (add/add): Merge conflict in cli/md5sum.php Auto-merging cli/md5sum.php CONFLICT (add/add): Merge conflict in cli/install_cacti.php Auto-merging cli/install_cacti.php CONFLICT (add/add): Merge conflict in cli/input_whitelist.php Auto-merging cli/input_whitelist.php CONFLICT (add/add): Merge conflict in cli/import_template.php Auto-merging cli/import_template.php CONFLICT (add/add): Merge conflict in cli/import_package.php Auto-merging cli/import_package.php CONFLICT (add/add): Merge conflict in cli/host_update_template.php Auto-merging cli/host_update_template.php CONFLICT (add/add): Merge conflict in cli/fix_mediumint.php Auto-merging cli/fix_mediumint.php CONFLICT (add/add): Merge conflict in cli/copy_user.php Auto-merging cli/copy_user.php CONFLICT (add/add): Merge conflict in cli/convert_tables.php Auto-merging cli/convert_tables.php CONFLICT (add/add): Merge conflict in cli/change_device.php Auto-merging cli/change_device.php CONFLICT (add/add): Merge conflict in cli/audit_database.php Auto-merging cli/audit_database.php CONFLICT (add/add): Merge conflict in cli/apply_automation_rules.php Auto-merging cli/apply_automation_rules.php CONFLICT (add/add): Merge conflict in cli/analyze_database.php Auto-merging cli/analyze_database.php CONFLICT (add/add): Merge conflict in cli/add_tree.php Auto-merging cli/add_tree.php CONFLICT (add/add): Merge conflict in cli/add_site.php Auto-merging cli/add_site.php CONFLICT (add/add): Merge conflict in cli/add_perms.php Auto-merging cli/add_perms.php CONFLICT (add/add): Merge conflict in cli/add_graphs.php Auto-merging cli/add_graphs.php CONFLICT (add/add): Merge conflict in cli/add_graph_template.php Auto-merging cli/add_graph_template.php CONFLICT (add/add): Merge conflict in cli/add_device.php Auto-merging cli/add_device.php CONFLICT (add/add): Merge conflict in cli/add_datasource.php Auto-merging cli/add_datasource.php CONFLICT (add/add): Merge conflict in cli/add_data_query.php Auto-merging cli/add_data_query.php CONFLICT (add/add): Merge conflict in changelog.php Auto-merging changelog.php CONFLICT (add/add): Merge conflict in cdef.php Auto-merging cdef.php CONFLICT (add/add): Merge conflict in cactid.php Auto-merging cactid.php CONFLICT (add/add): Merge conflict in cacti.sql Auto-merging cacti.sql CONFLICT (add/add): Merge conflict in boost_rrdupdate.php Auto-merging boost_rrdupdate.php CONFLICT (add/add): Merge conflict in automation_tree_rules.php Auto-merging automation_tree_rules.php CONFLICT (add/add): Merge conflict in automation_templates.php Auto-merging automation_templates.php CONFLICT (add/add): Merge conflict in automation_snmp.php Auto-merging automation_snmp.php CONFLICT (add/add): Merge conflict in automation_networks.php Auto-merging automation_networks.php CONFLICT (add/add): Merge conflict in automation_graph_rules.php Auto-merging automation_graph_rules.php CONFLICT (add/add): Merge conflict in automation_devices.php Auto-merging automation_devices.php CONFLICT (add/add): Merge conflict in auth_profile.php Auto-merging auth_profile.php CONFLICT (add/add): Merge conflict in auth_login.php Auto-merging auth_login.php CONFLICT (add/add): Merge conflict in auth_changepassword.php Auto-merging auth_changepassword.php CONFLICT (add/add): Merge conflict in auth_2fa.php Auto-merging auth_2fa.php CONFLICT (add/add): Merge conflict in aggregate_templates.php Auto-merging aggregate_templates.php CONFLICT (add/add): Merge conflict in aggregate_items.php Auto-merging aggregate_items.php CONFLICT (add/add): Merge conflict in aggregate_graphs.php Auto-merging aggregate_graphs.php CONFLICT (add/add): Merge conflict in about.php Auto-merging about.php CONFLICT (add/add): Merge conflict in README.md Auto-merging README.md CONFLICT (add/add): Merge conflict in LICENSE Auto-merging LICENSE CONFLICT (add/add): Merge conflict in CHANGELOG Auto-merging CHANGELOG CONFLICT (add/add): Merge conflict in .travis.yml Auto-merging .travis.yml CONFLICT (add/add): Merge conflict in .gitignore Auto-merging .gitignore error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 Correct header shebang Resolve all conflicts manually, mark them as resolved with "git add/rm <conflicted_files>", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort". (1)a year ago