From 6dd9fd8c52ad4f500756a55134c8276269c54d7a Mon Sep 17 00:00:00 2001 From: Andrew Fuerste-Henry Date: Tue, 23 Feb 2021 19:20:02 +0000 Subject: [PATCH] Bug 26602:[20.05.x] Remove stray merge marker --- .../intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt | 1 - 1 file changed, 1 deletion(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt index 46764d9aeb..e90db9f00b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt +++ b/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.

-- 2.11.0