https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42281
--- Comment #6 from Phil Ringnalda <[email protected]> --- Comment on attachment 196817 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=196817 Bug 42281: Tidy all script tags - authorities (auto tidy) >--- >a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tt >+++ >b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tt >@@ -144,25 +144,31 @@ > [% MACRO jsinclude BLOCK %] > <script nonce="[% Koha.CSPNonce | $raw %]" data-tt-allowed="true"> > var index = "[% index | html %]"; >- var authtypecode = "[% authtypecode | html %]"; >- const searchType = "[% marclist | html %]"; >- const template_path = "[% interface | html %]/[% theme | html %]"; >- const source = "[% source | html %]"; >+ var authtypecode = "[% authtypecode | html %]"; >+ const searchType = "[% marclist | html %]"; >+ const template_path = "[% interface | html %]/[% theme | html >%]"; >+ <<<<<<< HEAD >+ const source = "[% source | html %]"; >+ ||||||| parent of e2e08310b98 (Bug 42281: Tidy all script tags - >authorities (auto tidy)) >+ const source = >+ ======= >+ const source = >+ >>>>>>> e2e08310b98 (Bug 42281: Tidy all script tags - authorities >(auto tidy)) Those merge conflict markers look rather untidy :) -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] https://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/
