https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24085 Lucas Gass <lucas@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |lucas@bywatersolutions.com --- Comment #7 from Lucas Gass <lucas@bywatersolutions.com> --- For 19.05.x I run into merge conflicts which I am able to solve but the QA tool does not like what I have done: FAIL koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt OK filters OK forbidden patterns OK git manipulation OK js_in_body OK spelling OK tt_valid FAIL valid_template parse error - /kohadevbox/koha/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt line 873: unexpected token (END) [% END # /IF WrongTransfer && !transfertodo %] Please advise! -- You are receiving this mail because: You are watching all bug changes.