@@ -, +, @@ --- .../intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt | 1 - 1 file changed, 1 deletion(-) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt @@ -270,7 +270,6 @@ [% END %] -<<<<<<< HEAD [% IF ( else ) %]

MARC subfield structure admin for [% tagfield | html %] [% IF ( frameworkcode ) %](framework [% frameworkcode | html %])[% ELSE %](default framework)[% END %]

This screen shows the subfields associated with the selected tag. You can edit subfields or add a new one by clicking on edit.

--