@@ -, +, @@ --- koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt | 9 --------- 1 file changed, 9 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt @@ -168,12 +168,7 @@ You searched for [% searchfield | html %] [% END %] -<<<<<<< f7630d746947b82b40098be4cbac266e4a494553 - - -======= ->>>>>>> Bug11361 - opac z3950 search [% FOREACH loo IN loop %] @@ -186,11 +181,7 @@ Authority [% END %] -<<<<<<< f7630d746947b82b40098be4cbac266e4a494553 - -======= ->>>>>>> Bug11361 - opac z3950 search
TargetHostname/PortDatabaseUseridPasswordPreselectedRankSyntaxEncodingTimeoutRecord typeAttributesActions
TargetHostname/PortDatabaseUseridPasswordPreselectedRankSyntaxEncodingTimeoutRecord typeOpacOptions
[% loo.attributes | html %][% IF loo.opac %]X[% END %]