Graph generation broken after svn update to latest revision

Graph generation not working after svn update to 23.6.12860 (r12863) from ~r12651

 
Error reported: 

syntax error, unexpected token "<<" in /opt/observium/html/includes/graphs/graph.inc.php:199
#0: (unknown function) called at [/opt/observium/html/includes/graphs/graph.inc.php:199]
194: $return = rrdtool_graph($graphfile, $rrd_options);
195: //print_vars($GLOBALS['exec_status']);
196:
197: unlink($graphfile);
198:
199: <<<<<<< .mine
200: if (isset($config['graph_types'][$type][$subtype]['long']) && empty($graph_return['descr']))
201: {
202: $graph_return['descr'] = $config['graph_types'][$type][$subtype]['long'];
{{203: }}}
204: } else {
{{}}
{}