Parse error: syntax error, unexpected T_SL, expecting T_FUNCTION in /home/sitename/public_html/administrator/ components/com_cobalt/controllers/records.php on line 34

Cobalt 8.457 / joomla 3.2 - I tried to unpublish a record from the admin, this happened.

These are the offending lines.

<<<<<<< HEAD

public function getModel($name = 'Record', $prefix = 'CobaltModel', $config = array())

=======

public function &getModel($name = 'Record', $prefix = 'CobaltModel', $config = array())

44aee836c80e3e64a5b250655939011afcd3178e