Conflicts resolved: pandora_console/DEBIAN/control pandora_console/DEBIAN/make_deb_package.sh pandora_console/include/config_process.php pandora_console/pandoradb.data.oracle.sql |
||
---|---|---|
.. | ||
PandoraFMS | ||
ipmi-recon.pl | ||
snmp-recon.pl | ||
wmi-recon.pl |
Conflicts resolved: pandora_console/DEBIAN/control pandora_console/DEBIAN/make_deb_package.sh pandora_console/include/config_process.php pandora_console/pandoradb.data.oracle.sql |
||
---|---|---|
.. | ||
PandoraFMS | ||
ipmi-recon.pl | ||
snmp-recon.pl | ||
wmi-recon.pl |