https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38739
David Nind <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] Assignee|[email protected] |[email protected] Status|Needs Signoff |Patch doesn't apply --- Comment #12 from David Nind <[email protected]> --- Not sure how to test this one. Changed the assignee. The patches no longer apply 8-(... git bz apply 38739 Bug 38739 - Templates not ending with include intranet-bottom.inc in staff interface 187506 - Bug 38739: Fix mana-report-search-result.inc 187507 - Bug 38739: Fix admin/file_transports.pl 187508 - Bug 38739: Fix tools/batch_modify_holds.tt 187509 - Bug 38739: Fix some other wrong templates 187510 - Bug 38739: Fix basket/basket.tt Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 38739: Fix mana-report-search-result.inc Applying: Bug 38739: Fix admin/file_transports.pl Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/en/modules/admin/file_transports.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/file_transports.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/admin/file_transports.tt error: Failed to merge in the changes. Patch failed at 0001 Bug 38739: Fix admin/file_transports.pl -- 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/
