Conflicts: dead_mans_switch_client/models/dead_mans_switch_client.py
@ -64,9 +64,7 @@ class DeadMansSwitchClient(orm.AbstractModel):
logger.error('No server configured!')
return
timeout = self.env['ir.config_parameter'].get_param(
'dead_mans_switch_client.send_timeout')
if not timeout:
timeout = SEND_TIMEOUT
'dead_mans_switch_client.send_timeout', SEND_TIMEOUT)
data = self._get_data(cr, uid, context=context)
logger.debug('sending %s', data)
urllib2.urlopen(