We're updating the issue view to help you get more done. 

Collections Summary Page Error. PROV 1.7.5

Description

I am attempting to generate a summary of the objects in a collection. I have 3 collections defined only one has a test object entered. When I browse collections and select the one with the entry and open the Collections Editor screen then click on Summary I get the following error.
Parse error: syntax error, unexpected '<<' (T_SL) in /var/www/html/providence-1.7.5/themes/default/views/editor/collections/summary_html.php on line 79
Line 79
79 <<<<<<< HEAD
The correct Collection Title appears in the Collection Editor
The collection summary display has two metadata elements defined i.e Related Objects and Related Enities.
I have defined the title for the summary page in app/printTemplates/summary/header.php like this
if ($t_display->get('display_code') == 'coll_record')
{print "<div class='headerText'>"._t('COLLECTION RECORD')."</div>";}
this method works for my other summary pages.
Some guidance in resolving this problem would be appreciated.

See http://collectiveaccess.org/support/forum/index.php?p=/discussion/298951/collections-summary-page-error-prov-1-7-5#latest

Environment

None

Assignee

User known

Reporter

User known

Labels

None

Components

Fix versions

Affects versions

Priority

Major
Configure