Resolving merge conflicts

This commit is contained in:
Finley Ghosh 2025-07-20 18:05:58 +10:00
commit 057231a414

View file

@ -56,11 +56,20 @@ $host = $_SERVER['HTTP_HOST'];
));
*/
Configure::write('smtp_settings', array(
'port' => '25',
'timeout' => '30',
'host' => '172.17.0.1'));
// Mailhog SMTP settings for local development
// Configure::write('smtp_settings', array(
// 'port' => '1025',
// 'timeout' => '30',
// 'host' => 'host.docker.internal'
// ));
//Production/Staging Config
$production_hosts = array('cmc.lan', '192.168.0.7', 'cmcbeta.lan', 'office.cmctechnologies.com.au:5000');